From 4d6158891091e051319273e1ab0323ea2338aeaf Mon Sep 17 00:00:00 2001 From: "Edward M. Kagan" Date: Thu, 1 Oct 2020 17:55:20 +0300 Subject: [PATCH] Optionalized password config --- .../main/java/org/pagan/quarkus/jedis/JedisConfig.java | 3 ++- .../main/java/org/pagan/quarkus/jedis/JedisSupport.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jedis/runtime/src/main/java/org/pagan/quarkus/jedis/JedisConfig.java b/jedis/runtime/src/main/java/org/pagan/quarkus/jedis/JedisConfig.java index 6bdfceb..3a468d9 100644 --- a/jedis/runtime/src/main/java/org/pagan/quarkus/jedis/JedisConfig.java +++ b/jedis/runtime/src/main/java/org/pagan/quarkus/jedis/JedisConfig.java @@ -3,6 +3,7 @@ package org.pagan.quarkus.jedis; import io.quarkus.runtime.annotations.ConfigItem; import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; +import java.util.Optional; /** * @@ -39,6 +40,6 @@ public class JedisConfig { * Cluster access password */ @ConfigItem(defaultValue = "") - public String password; + public Optional password; } diff --git a/jedis/runtime/src/main/java/org/pagan/quarkus/jedis/JedisSupport.java b/jedis/runtime/src/main/java/org/pagan/quarkus/jedis/JedisSupport.java index 71b5899..ec25bc9 100644 --- a/jedis/runtime/src/main/java/org/pagan/quarkus/jedis/JedisSupport.java +++ b/jedis/runtime/src/main/java/org/pagan/quarkus/jedis/JedisSupport.java @@ -37,8 +37,8 @@ public class JedisSupport { if (config.shards.contains(",")) { List jedisShards = Arrays.stream(config.shards.split(",")).map(uri -> { JedisShardInfo jedisShardInfo = new JedisShardInfo(URI.create(uri)); - if (config.password.length() > 0) { - jedisShardInfo.setPassword(config.password); + if (config.password.isPresent()) { + jedisShardInfo.setPassword(config.password.get()); } return jedisShardInfo; }).collect(Collectors.toList()); @@ -46,9 +46,9 @@ public class JedisSupport { } else { URI server = URI.create(config.shards); - if (config.password.length() > 0) { + if (config.password.isPresent()) { this.jedisPool = new JedisPool(poolConfig, server.getHost(), server.getPort(), Protocol.DEFAULT_TIMEOUT, - config.password); + config.password.get()); } else { this.jedisPool = new JedisPool(poolConfig, server); }