Moved from profile to conditional

Improved dialect resolving
This commit is contained in:
jvi
2020-11-24 00:55:31 +01:00
parent ffa17b8457
commit e7f65af1ed
13 changed files with 146 additions and 52 deletions

View File

@@ -3,11 +3,9 @@ package ca.uhn.fhir.jpa.starter;
import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.jpa.config.BaseJavaConfigDstu3;
import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
import ca.uhn.fhir.jpa.starter.annotations.OnDSTU3Condition;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.context.annotation.Profile;
import org.springframework.context.annotation.*;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@@ -16,7 +14,7 @@ import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
@Configuration
@Profile("dstu3")
@Conditional(OnDSTU3Condition.class)
public class FhirServerConfigDstu3 extends BaseJavaConfigDstu3 {
@Autowired