Skip to content
Snippets Groups Projects
Commit ad12037c authored by Mirco Nasuti's avatar Mirco Nasuti
Browse files

clean datasource configuration import

parent 488b687e
No related branches found
No related tags found
No related merge requests found
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();
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment