From f0b9c62a1bcf29091a4731c621162da65d207052 Mon Sep 17 00:00:00 2001
From: ineanto <pantoine.rochas@gmail.com>
Date: Sat, 20 May 2023 00:54:49 +0200
Subject: [PATCH] feat(cache): get address and port from configuration

---
 .../nicko/storage/cache/redis/RedisCache.java       | 13 +++++++++++--
 .../storage/cache/redis/RedisCacheProvider.java     | 12 ++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCache.java b/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCache.java
index e833ae8..b9dffe7 100644
--- a/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCache.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCache.java
@@ -3,6 +3,7 @@ package xyz.atnrch.nicko.storage.cache.redis;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import redis.clients.jedis.Jedis;
+import xyz.atnrch.nicko.config.Configuration;
 import xyz.atnrch.nicko.disguise.ActionResult;
 import xyz.atnrch.nicko.disguise.NickoProfile;
 import xyz.atnrch.nicko.storage.cache.Cache;
@@ -12,13 +13,21 @@ import java.util.Optional;
 import java.util.UUID;
 
 public class RedisCache extends Cache {
-    private final Gson gson = new GsonBuilder().serializeNulls().setPrettyPrinting().create();
+    private final Gson gson = new GsonBuilder()
+            .serializeNulls()
+            .setPrettyPrinting()
+            .create();
+    private final Configuration configuration;
     private RedisCacheProvider provider;
 
+    public RedisCache(Configuration configuration) {
+        this.configuration = configuration;
+    }
+
     @Override
     public CacheProvider getProvider() {
         if (provider == null) {
-            provider = new RedisCacheProvider();
+            provider = new RedisCacheProvider(configuration);
         }
         return provider;
     }
diff --git a/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCacheProvider.java b/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCacheProvider.java
index 343cc3a..6692a52 100644
--- a/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCacheProvider.java
+++ b/src/main/java/xyz/atnrch/nicko/storage/cache/redis/RedisCacheProvider.java
@@ -1,16 +1,24 @@
 package xyz.atnrch.nicko.storage.cache.redis;
 
+import xyz.atnrch.nicko.config.Configuration;
 import xyz.atnrch.nicko.storage.cache.CacheProvider;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
 public class RedisCacheProvider implements CacheProvider {
+    private final Configuration configuration;
     private JedisPool pool;
 
+    public RedisCacheProvider(Configuration configuration) {
+        this.configuration = configuration;
+    }
+
     @Override
     public boolean init() {
-        // TODO: 3/12/23 Get port from configuration
-        pool = new JedisPool("localhost", 6379);
+        pool = new JedisPool(
+                configuration.getRedisConfiguration().getAddress(),
+                configuration.getRedisConfiguration().getPort()
+        );
         return !pool.isClosed() && pool.getResource() != null;
     }