ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Normalize configuration between cache-updater and http-service

Browse Source 
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2019-02-16 14:23:58 +01:00
committed by Adam
parent 4500b74c89
commit 94a0ee5587
3 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java vendored
View File

@@ -33,9 +33,10 @@ import java.util.Map;
import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.sql2o.Sql2o;
import org.sql2o.converters.Converter;
import org.sql2o.quirks.NoQuirks;
@@ -43,16 +44,7 @@ import org.sql2o.quirks.NoQuirks;
@Configuration
public class CacheConfiguration
{
@Value("${jdbc.url}")
private String jdbcUrl;
@Value("${jdbc.username}")
private String jdbcUsername;
@Value("${jdbc.password}")
private String jdbcPassword;
@Value("${minio.url}")
@Value("${minio.endpoint}")
private String minioUrl;
@Value("${minio.accesskey}")
@@ -62,13 +54,10 @@ public class CacheConfiguration
private String minioSecretKey;
@Bean
@ConfigurationProperties(prefix = "datasource.runelite-cache")
public DataSource dataSource()
{
DriverManagerDataSource dataSource = new DriverManagerDataSource();
dataSource.setUrl(jdbcUrl);
dataSource.setUsername(jdbcUsername);
dataSource.setPassword(jdbcPassword);
return dataSource;
return DataSourceBuilder.create().build();
}
@Bean