From 3a051f96fd7213ce59f30ed8ab0f68f248762f1f Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 6 Apr 2022 21:16:22 +0200 Subject: [PATCH] passing the configuration when initialising the object instead of in the connection method --- src/main/java/earth/krakatoa/core/KraCore.java | 8 ++++---- .../java/earth/krakatoa/core/mongo/MongoManager.java | 10 +++++++--- .../java/earth/krakatoa/core/redis/RedisManager.java | 12 ++++++++---- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/earth/krakatoa/core/KraCore.java b/src/main/java/earth/krakatoa/core/KraCore.java index 6b1a06e..aff2645 100644 --- a/src/main/java/earth/krakatoa/core/KraCore.java +++ b/src/main/java/earth/krakatoa/core/KraCore.java @@ -11,11 +11,11 @@ public class KraCore { private final RedisManager redisManager; public KraCore(MongoConfig mongoConfig, RedisConfig redisConfig) { - this.mongoManager = new MongoManager(); - this.mongoManager.connect(mongoConfig); + this.mongoManager = new MongoManager(mongoConfig); + this.mongoManager.connect(); - this.redisManager = new RedisManager(); - this.redisManager.connect(redisConfig); + this.redisManager = new RedisManager(redisConfig); + this.redisManager.connect(); } public void shutdown() { diff --git a/src/main/java/earth/krakatoa/core/mongo/MongoManager.java b/src/main/java/earth/krakatoa/core/mongo/MongoManager.java index 8cc75f0..0010fea 100644 --- a/src/main/java/earth/krakatoa/core/mongo/MongoManager.java +++ b/src/main/java/earth/krakatoa/core/mongo/MongoManager.java @@ -7,9 +7,7 @@ import com.mongodb.ServerApiVersion; import com.mongodb.reactivestreams.client.MongoClient; import com.mongodb.reactivestreams.client.MongoClients; import earth.krakatoa.core.config.MongoConfig; -import lombok.Data; -@Data public class MongoManager { private ConnectionString connectionString; @@ -18,7 +16,13 @@ public class MongoManager { private MongoClientSettings mongoClientSettings; private MongoClient mongoClient; - public void connect(MongoConfig mongoConfig) { + private MongoConfig mongoConfig; + + public MongoManager(MongoConfig mongoConfig) { + this.mongoConfig = mongoConfig; + } + + public void connect() { this.connectionString = new ConnectionString( "mongodb://" + mongoConfig.getUsername() + ":" + mongoConfig.getPassword() + "@" + mongoConfig.getHostname() + ":" + mongoConfig.getPort() + "/?authSource=" diff --git a/src/main/java/earth/krakatoa/core/redis/RedisManager.java b/src/main/java/earth/krakatoa/core/redis/RedisManager.java index c60f73f..e910095 100644 --- a/src/main/java/earth/krakatoa/core/redis/RedisManager.java +++ b/src/main/java/earth/krakatoa/core/redis/RedisManager.java @@ -1,20 +1,24 @@ package earth.krakatoa.core.redis; import earth.krakatoa.core.config.RedisConfig; -import lombok.Data; import org.redisson.Redisson; import org.redisson.api.RedissonClient; import org.redisson.config.Config; -@Data public class RedisManager { private Config config; private RedissonClient redissonClient; - public void connect(RedisConfig redisConfig) { + private RedisConfig redisConfig; + + public RedisManager(RedisConfig redisConfig) { + this.redisConfig = redisConfig; + } + + public void connect() { this.config = new Config(); - this.config.useSingleServer().setAddress("redis://" + redisConfig.getIp() + ":" + redisConfig.getPort()); + this.config.useSingleServer().setAddress("redis://" + this.redisConfig.getIp() + ":" + this.redisConfig.getPort()); this.redissonClient = Redisson.create(this.config); }