Fix issue in 5.2.0 bump

This commit is contained in:
jamesagnew
2020-11-18 07:20:51 -05:00
parent cfd180e3f3
commit 8850e645ce
2 changed files with 36 additions and 0 deletions

View File

@@ -3,6 +3,7 @@ package ca.uhn.fhir.jpa.starter;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.jpa.binstore.DatabaseBlobBinaryStorageSvcImpl;
import ca.uhn.fhir.jpa.binstore.IBinaryStorageSvc;
import ca.uhn.fhir.jpa.config.HibernateDialectProvider;
import ca.uhn.fhir.jpa.model.config.PartitionSettings;
import ca.uhn.fhir.jpa.model.entity.ModelConfig;
import ca.uhn.fhir.jpa.subscription.channel.subscription.SubscriptionDeliveryHandlerFactory;
@@ -10,9 +11,11 @@ import ca.uhn.fhir.jpa.subscription.match.deliver.email.IEmailSender;
import ca.uhn.fhir.jpa.subscription.match.deliver.email.JavaMailEmailSender;
import com.google.common.base.Strings;
import org.hl7.fhir.dstu2.model.Subscription;
import org.springframework.boot.env.YamlPropertySourceLoader;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
import org.springframework.context.annotation.Primary;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import java.util.Optional;
@@ -110,6 +113,11 @@ public class FhirServerConfigCommon {
return retVal;
}
@Bean
public YamlPropertySourceLoader yamlPropertySourceLoader() {
return new YamlPropertySourceLoader();
}
@Bean
public PartitionSettings partitionSettings(AppProperties appProperties) {
PartitionSettings retVal = new PartitionSettings();
@@ -123,6 +131,12 @@ public class FhirServerConfigCommon {
}
@Primary
@Bean
public HibernateDialectProvider jpaStarterDialectProvider() {
return new JpaHibernateDialectProvider();
}
@Bean
public ModelConfig modelConfig(AppProperties appProperties) {
ModelConfig modelConfig = new ModelConfig();

View File

@@ -0,0 +1,22 @@
package ca.uhn.fhir.jpa.starter;
import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.jpa.config.HibernateDialectProvider;
import org.hibernate.dialect.Dialect;
import org.springframework.beans.factory.annotation.Value;
public class JpaHibernateDialectProvider extends HibernateDialectProvider {
@Value("${spring.jpa.properties.hibernate.dialect}")
public String myDialectClass;
@Override
public Dialect getDialect() {
try {
return (Dialect) Class.forName(myDialectClass).newInstance();
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
throw new ConfigurationException("Can not load dialect: " + myDialectClass);
}
}
}