From ff5dc1bf6634d0e64e5f1afac8bf9cb671e0387d Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Wed, 13 Jul 2016 08:40:40 +0200
Subject: [PATCH] clean more again datasource configuration import

---
 .../PersistenceConfiguration.java              | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java b/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
index 99beea7bb..e96470f15 100644
--- a/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
+++ b/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
@@ -1,12 +1,10 @@
 package org.hbp.mip.configuration;
 
 import org.hbp.mip.utils.CSVUtil;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
-import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.orm.jpa.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.orm.jpa.JpaVendorAdapter;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@@ -24,6 +22,9 @@ import java.util.Properties;
 @EntityScan(basePackages = "org.hbp.mip.model")
 public class PersistenceConfiguration {
 
+    @Autowired
+    DataSource dataSource;
+
     @Bean
     public CSVUtil csvUtil() {
         return new CSVUtil();
@@ -32,7 +33,7 @@ public class PersistenceConfiguration {
     @Bean
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
-        em.setDataSource(dataSource());
+        em.setDataSource(dataSource);
         JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         em.setJpaVendorAdapter(vendorAdapter);
         em.setJpaProperties(additionalProperties());
@@ -44,13 +45,4 @@ public class PersistenceConfiguration {
         properties.setProperty("hibernate.show_sql", "true");
         return properties;
     }
-
-    @ConfigurationProperties("spring.datasource")
-    @Bean
-    @Primary
-    public DataSource dataSource() {
-        return DataSourceBuilder
-                .create()
-                .build();
-    }
 }
-- 
GitLab