From ad12037c8a027d62e166b96471eedb8055e42f13 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Wed, 13 Jul 2016 08:38:50 +0200
Subject: [PATCH] clean datasource configuration import
---
.../PersistenceConfiguration.java | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java b/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
index 7e0791611..99beea7bb 100644
--- a/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
+++ b/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
@@ -1,8 +1,8 @@
package org.hbp.mip.configuration;
import org.hbp.mip.utils.CSVUtil;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
+import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.orm.jpa.EntityScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -24,18 +24,6 @@ import java.util.Properties;
@EntityScan(basePackages = "org.hbp.mip.model")
public class PersistenceConfiguration {
- @Value("#{'${spring.datasource.username:postgres}'}")
- String dbUser;
-
- @Value("#{'${spring.datasource.password:pass}'}")
- String dbPass;
-
- @Value("#{'${spring.datasource.url:jdbc:postgresql://db:5432/postgres}'}")
- String dbUrl;
-
- @Value("#{'${spring.datasource.driver-class-name:org.postgresql.Driver}'}")
- String dbDriver;
-
@Bean
public CSVUtil csvUtil() {
return new CSVUtil();
@@ -57,15 +45,12 @@ public class PersistenceConfiguration {
return properties;
}
+ @ConfigurationProperties("spring.datasource")
@Bean
@Primary
public DataSource dataSource() {
return DataSourceBuilder
.create()
- .username(dbUser)
- .password(dbPass)
- .url(dbUrl)
- .driverClassName(dbDriver)
.build();
}
}
--
GitLab