Optionalized password config

master
Edward M. Kagan 5 years ago
parent 7baf5895f8
commit 4d61588910

@ -3,6 +3,7 @@ package org.pagan.quarkus.jedis;
import io.quarkus.runtime.annotations.ConfigItem; import io.quarkus.runtime.annotations.ConfigItem;
import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigPhase;
import io.quarkus.runtime.annotations.ConfigRoot; import io.quarkus.runtime.annotations.ConfigRoot;
import java.util.Optional;
/** /**
* *
@ -39,6 +40,6 @@ public class JedisConfig {
* Cluster access password * Cluster access password
*/ */
@ConfigItem(defaultValue = "") @ConfigItem(defaultValue = "")
public String password; public Optional<String> password;
} }

@ -37,8 +37,8 @@ public class JedisSupport {
if (config.shards.contains(",")) { if (config.shards.contains(",")) {
List<JedisShardInfo> jedisShards = Arrays.stream(config.shards.split(",")).map(uri -> { List<JedisShardInfo> jedisShards = Arrays.stream(config.shards.split(",")).map(uri -> {
JedisShardInfo jedisShardInfo = new JedisShardInfo(URI.create(uri)); JedisShardInfo jedisShardInfo = new JedisShardInfo(URI.create(uri));
if (config.password.length() > 0) { if (config.password.isPresent()) {
jedisShardInfo.setPassword(config.password); jedisShardInfo.setPassword(config.password.get());
} }
return jedisShardInfo; return jedisShardInfo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
@ -46,9 +46,9 @@ public class JedisSupport {
} else { } else {
URI server = URI.create(config.shards); 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, this.jedisPool = new JedisPool(poolConfig, server.getHost(), server.getPort(), Protocol.DEFAULT_TIMEOUT,
config.password); config.password.get());
} else { } else {
this.jedisPool = new JedisPool(poolConfig, server); this.jedisPool = new JedisPool(poolConfig, server);
} }

Loading…
Cancel
Save