Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed config files

Browse Source
This commit is contained in:
Ken Stevens
2020-12-04 09:47:21 -05:00
parent cddb644476
commit 8da9989984
4 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
View File

@@ -130,17 +130,6 @@ public class BaseJpaRestfulServer extends RestfulServer {
setFhirContext(fhirSystemDao.getContext()); 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()); registerProviders(resourceProviders.createProviders());
registerProvider(jpaSystemProvider); registerProvider(jpaSystemProvider);
@@ -153,7 +142,7 @@ public class BaseJpaRestfulServer extends RestfulServer {
* provide further customization of your server's CapabilityStatement * provide further customization of your server's CapabilityStatement
*/ */
FhirVersionEnum fhirVersion = fhirSystemDao.getContext().getVersion().getVersion();
if (fhirVersion == FhirVersionEnum.DSTU2) { if (fhirVersion == FhirVersionEnum.DSTU2) {
JpaConformanceProviderDstu2 confProvider = new JpaConformanceProviderDstu2(this, fhirSystemDao, JpaConformanceProviderDstu2 confProvider = new JpaConformanceProviderDstu2(this, fhirSystemDao,

4
src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigR4.java
View File

@@ -4,7 +4,7 @@ import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.jpa.config.BaseJavaConfigR4; import ca.uhn.fhir.jpa.config.BaseJavaConfigR4;
import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider; import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
import ca.uhn.fhir.jpa.starter.annotations.OnR4Condition; 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.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.*; import org.springframework.context.annotation.*;
import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.ConfigurableEnvironment;
@@ -16,7 +16,7 @@ import javax.sql.DataSource;
@Configuration @Configuration
@Conditional(OnR4Condition.class) @Conditional(OnR4Condition.class)
@Import(CqlConfigR4.class) @Import(StarterCqlR4Config.class)
public class FhirServerConfigR4 extends BaseJavaConfigR4 { public class FhirServerConfigR4 extends BaseJavaConfigR4 {
@Autowired @Autowired

2
src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigDstu3.java → src/main/java/ca/uhn/fhir/jpa/starter/cql/StarterCqlDstu3Config.java
View File

@@ -9,5 +9,5 @@ import org.springframework.context.annotation.Import;
@Configuration @Configuration
@Conditional({OnDSTU3Condition.class, CqlConfigCondition.class}) @Conditional({OnDSTU3Condition.class, CqlConfigCondition.class})
@Import({CqlDstu3Config.class}) @Import({CqlDstu3Config.class})
public class CqlConfigDstu3 { public class StarterCqlDstu3Config {
} }

2
src/main/java/ca/uhn/fhir/jpa/starter/cql/CqlConfigR4.java → src/main/java/ca/uhn/fhir/jpa/starter/cql/StarterCqlR4Config.java
View File

@@ -6,5 +6,5 @@ import org.springframework.context.annotation.Import;
@Conditional({CqlConfigCondition.class}) @Conditional({CqlConfigCondition.class})
@Import({CqlR4Config.class}) @Import({CqlR4Config.class})
public class CqlConfigR4 { public class StarterCqlR4Config {
} }