1 files changed, 9 insertions, 2 deletions

diff --git a/server/src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java b/server/src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java
index 1a3953de..09558bc0 100755
--- a/server/src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java
+++ b/server/src/main/java/org/onap/usecaseui/server/hibernate/HibernateConfiguration.java
@@ -22,6 +22,7 @@ import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.context.annotation.Bean;

 import org.springframework.context.annotation.Configuration;

+import org.springframework.core.env.Environment;

 import org.springframework.orm.hibernate5.LocalSessionFactoryBean;

 import org.springframework.orm.jpa.JpaTransactionManager;

 import org.springframework.transaction.PlatformTransactionManager;

@@ -31,6 +32,9 @@ import org.springframework.transaction.PlatformTransactionManager;
 public class HibernateConfiguration

 {

     @Autowired

+    private Environment environment;

+

+    @Autowired

     private DataSource dataSource;

 

     @Bean

@@ -45,8 +49,11 @@ public class HibernateConfiguration
 

     private Properties hibernateProperties() {

         Properties properties = new Properties();

-        properties.put("hibernate.dialect", "org.hibernate.dialect.MySQLDialect");

-        properties.put("hibernate.show_sql", "true");

+        properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQL9Dialect");

+        properties.setProperty("hibernate.current_session_context_class", environment.getProperty("spring.jpa.properties.hibernate.current_session_context_class"));

+        properties.setProperty("hibernate.show-sql", environment.getProperty("spring.jpa.properties.hibernate.show-sql"));

+        properties.setProperty("hibernate.cache.use_second_level_cache", environment.getProperty("spring.jpa.properties.hibernate.cache.use_second_level_cache"));

+        properties.setProperty("hibernate.cache.use_query_cache", environment.getProperty("spring.jpa.properties.hibernate.cache.use_query_cache"));

         return properties;        

     }