ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

feat(redis): add test for redis cache

Browse source
This commit is contained in:
ineanto 2023-05-22 14:13:40 +02:00
parent 17fa5e81e7
commit 318c0ffefd
6 changed files with 71 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/xyz/atnrch/nicko/config/DataSourceConfiguration.java
View file

@ -39,4 +39,15 @@ public class DataSourceConfiguration {
public String getPassword() {
return password;
}
@Override
public String toString() {
return "DataSourceConfiguration{" +
"enabled=" + enabled +
", address='" + address + '\'' +
", port=" + port +
", username='" + username + '\'' +
", password='" + password + '\'' +
'}';
}
}

1
src/main/java/xyz/atnrch/nicko/storage/redis/RedisCache.java
View file

@ -21,6 +21,7 @@ public class RedisCache extends Cache {
private RedisCacheProvider provider;
public RedisCache(Configuration configuration) {
System.out.println("Loaded REDIS CACHE");
this.configuration = configuration;
}

6
src/main/java/xyz/atnrch/nicko/storage/redis/RedisCacheProvider.java
View file

@ -1,6 +1,7 @@
package xyz.atnrch.nicko.storage.redis;
import xyz.atnrch.nicko.config.Configuration;
import xyz.atnrch.nicko.config.DataSourceConfiguration;
import xyz.atnrch.nicko.storage.CacheProvider;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
@ -15,9 +16,10 @@ public class RedisCacheProvider implements CacheProvider {
@Override
public boolean init() {
final DataSourceConfiguration redisConfiguration = configuration.getRedisConfiguration();
pool = new JedisPool(
configuration.getRedisConfiguration().getAddress(),
configuration.getRedisConfiguration().getPort()
redisConfiguration.getAddress(),
redisConfiguration.getPort()
);
return !pool.isClosed() && pool.getResource() != null;
}

8
src/main/java/xyz/atnrch/nicko/storage/sql/SQLStorageProvider.java
View file

@ -26,10 +26,10 @@ public class SQLStorageProvider implements StorageProvider {
public boolean init() {
try {
final MariaDbDataSource dataSource = new MariaDbDataSource();
final DataSourceConfiguration dataSourceConfiguration = configuration.getSqlConfiguration();
dataSource.setUrl("jdbc:mariadb://" + dataSourceConfiguration.getAddress() + ":" + dataSourceConfiguration.getPort());
dataSource.setUser(dataSourceConfiguration.getUsername());
dataSource.setPassword(dataSourceConfiguration.getPassword());
final DataSourceConfiguration sqlConfiguration = configuration.getSqlConfiguration();
dataSource.setUrl("jdbc:mariadb://" + sqlConfiguration.getAddress() + ":" + sqlConfiguration.getPort());
dataSource.setUser(sqlConfiguration.getUsername());
dataSource.setPassword(sqlConfiguration.getPassword());
connection = dataSource.getConnection();
final boolean initialized = connection != null && !connection.isClosed();