From 94a0ee5587c85f4971882bdef0aceef055b683f3 Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Sat, 16 Feb 2019 14:23:58 +0100
Subject: [PATCH] Normalize configuration between cache-updater and
 http-service

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
---
 cache-updater/application.properties          |  7 -------
 .../cache/updater/CacheConfiguration.java     | 21 +++++--------------
 .../src/main/resources/application.yaml       | 16 ++++++++++++++
 3 files changed, 21 insertions(+), 23 deletions(-)
 delete mode 100644 cache-updater/application.properties
 create mode 100644 cache-updater/src/main/resources/application.yaml

diff --git a/cache-updater/application.properties b/cache-updater/application.properties
deleted file mode 100644
index 8bfa1c2542..0000000000
--- a/cache-updater/application.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-jdbc.url=jdbc:mysql://192.168.1.2:3306/cache
-jdbc.username=runelite
-jdbc.password=runelite
-minio.url=http://192.168.1.2:9000
-minio.accesskey=QPQ15JX1ESAVMR0TLCL1
-minio.secretkey=
-minio.bucket=runelite
\ No newline at end of file
diff --git a/cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java b/cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java
index 354ca0b394..229ea1d268 100644
--- a/cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java
+++ b/cache-updater/src/main/java/net/runelite/cache/updater/CacheConfiguration.java
@@ -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
diff --git a/cache-updater/src/main/resources/application.yaml b/cache-updater/src/main/resources/application.yaml
new file mode 100644
index 0000000000..df290d680f
--- /dev/null
+++ b/cache-updater/src/main/resources/application.yaml
@@ -0,0 +1,16 @@
+---
+# Database
+datasource:
+  runelite-cache:
+    driverClassName: com.mysql.jdbc.Driver
+    type: com.mysql.jdbc.jdbc2.optional.MysqlDataSource
+    url: jdbc:mysql://localhost/runelite-cache
+    username: runelite
+    password: runelite
+
+# Minio client storage for cache
+minio:
+  endpoint: http://localhost:9000
+  accesskey: AM54M27O4WZK65N6F8IP
+  secretkey: /PZCxzmsJzwCHYlogcymuprniGCaaLUOET2n6yMP
+  bucket: runelite