|
|
@ -1,5 +1,5 @@
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
* Copyright 2012-2021 the original author or authors.
|
|
|
|
* Copyright 2012-2022 the original author or authors.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
@ -28,7 +28,6 @@ import org.springframework.data.redis.connection.RedisNode;
|
|
|
|
import org.springframework.data.redis.connection.RedisPassword;
|
|
|
|
import org.springframework.data.redis.connection.RedisPassword;
|
|
|
|
import org.springframework.data.redis.connection.RedisSentinelConfiguration;
|
|
|
|
import org.springframework.data.redis.connection.RedisSentinelConfiguration;
|
|
|
|
import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
|
|
|
|
import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
|
|
|
|
import org.springframework.util.Assert;
|
|
|
|
|
|
|
|
import org.springframework.util.ClassUtils;
|
|
|
|
import org.springframework.util.ClassUtils;
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
|
|
|
|
|
@ -144,9 +143,7 @@ abstract class RedisConnectionConfiguration {
|
|
|
|
List<RedisNode> nodes = new ArrayList<>();
|
|
|
|
List<RedisNode> nodes = new ArrayList<>();
|
|
|
|
for (String node : sentinel.getNodes()) {
|
|
|
|
for (String node : sentinel.getNodes()) {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
String[] parts = StringUtils.split(node, ":");
|
|
|
|
nodes.add(RedisNode.fromString(node));
|
|
|
|
Assert.state(parts.length == 2, "Must be defined as 'host:port'");
|
|
|
|
|
|
|
|
nodes.add(new RedisNode(parts[0], Integer.parseInt(parts[1])));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (RuntimeException ex) {
|
|
|
|
catch (RuntimeException ex) {
|
|
|
|
throw new IllegalStateException("Invalid redis sentinel property '" + node + "'", ex);
|
|
|
|
throw new IllegalStateException("Invalid redis sentinel property '" + node + "'", ex);
|
|
|
|