remain only changed lines

remain only changed lines

Signed-off-by: AnJia <anjia0532@gmail.com>
pull/2983/head^2
AnJia 5 years ago committed by GitHub
parent 40c80d7582
commit 923949fce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -45,11 +45,11 @@ import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
/** /**
* *
* @author Nikita Koksharov * @author Nikita Koksharov
* @author Nikos Kakavas (https://github.com/nikakis) * @author Nikos Kakavas (https://github.com/nikakis)
* @author AnJia (https://anjia0532.github.io/) * @author AnJia (https://anjia0532.github.io/)
* *
*/ */
@Configuration @Configuration
@ConditionalOnClass({Redisson.class, RedisOperations.class}) @ConditionalOnClass({Redisson.class, RedisOperations.class})
@ -65,13 +65,13 @@ public class RedissonAutoConfiguration {
@Autowired @Autowired
private RedissonProperties redissonProperties; private RedissonProperties redissonProperties;
@Autowired @Autowired
private RedisProperties redisProperties; private RedisProperties redisProperties;
@Autowired @Autowired
private ApplicationContext ctx; private ApplicationContext ctx;
@Bean @Bean
@ConditionalOnMissingBean(name = "redisTemplate") @ConditionalOnMissingBean(name = "redisTemplate")
public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) { public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
@ -93,7 +93,7 @@ public class RedissonAutoConfiguration {
public RedissonConnectionFactory redissonConnectionFactory(RedissonClient redisson) { public RedissonConnectionFactory redissonConnectionFactory(RedissonClient redisson) {
return new RedissonConnectionFactory(redisson); return new RedissonConnectionFactory(redisson);
} }
@Bean(destroyMethod = "shutdown") @Bean(destroyMethod = "shutdown")
@ConditionalOnMissingBean(RedissonClient.class) @ConditionalOnMissingBean(RedissonClient.class)
public RedissonClient redisson() throws IOException { public RedissonClient redisson() throws IOException {
@ -110,7 +110,7 @@ public class RedissonAutoConfiguration {
} else { } else {
timeout = (Integer)timeoutValue; timeout = (Integer)timeoutValue;
} }
if (redissonProperties.getConfigBlock() != null) { if (redissonProperties.getConfigBlock() != null) {
try { try {
config = Config.fromYAML(redissonProperties.getConfigBlock()); config = Config.fromYAML(redissonProperties.getConfigBlock());
@ -137,14 +137,14 @@ public class RedissonAutoConfiguration {
} else if (redisProperties.getSentinel() != null) { } else if (redisProperties.getSentinel() != null) {
Method nodesMethod = ReflectionUtils.findMethod(Sentinel.class, "getNodes"); Method nodesMethod = ReflectionUtils.findMethod(Sentinel.class, "getNodes");
Object nodesValue = ReflectionUtils.invokeMethod(nodesMethod, redisProperties.getSentinel()); Object nodesValue = ReflectionUtils.invokeMethod(nodesMethod, redisProperties.getSentinel());
String[] nodes; String[] nodes;
if (nodesValue instanceof String) { if (nodesValue instanceof String) {
nodes = convert(Arrays.asList(((String)nodesValue).split(","))); nodes = convert(Arrays.asList(((String)nodesValue).split(",")));
} else { } else {
nodes = convert((List<String>)nodesValue); nodes = convert((List<String>)nodesValue);
} }
config = new Config(); config = new Config();
config.useSentinelServers() config.useSentinelServers()
.setMasterName(redisProperties.getSentinel().getMaster()) .setMasterName(redisProperties.getSentinel().getMaster())
@ -156,9 +156,9 @@ public class RedissonAutoConfiguration {
Object clusterObject = ReflectionUtils.invokeMethod(clusterMethod, redisProperties); Object clusterObject = ReflectionUtils.invokeMethod(clusterMethod, redisProperties);
Method nodesMethod = ReflectionUtils.findMethod(clusterObject.getClass(), "getNodes"); Method nodesMethod = ReflectionUtils.findMethod(clusterObject.getClass(), "getNodes");
List<String> nodesObject = (List) ReflectionUtils.invokeMethod(nodesMethod, clusterObject); List<String> nodesObject = (List) ReflectionUtils.invokeMethod(nodesMethod, clusterObject);
String[] nodes = convert(nodesObject); String[] nodes = convert(nodesObject);
config = new Config(); config = new Config();
config.useClusterServers() config.useClusterServers()
.addNodeAddress(nodes) .addNodeAddress(nodes)
@ -171,7 +171,7 @@ public class RedissonAutoConfiguration {
if (method != null && (Boolean)ReflectionUtils.invokeMethod(method, redisProperties)) { if (method != null && (Boolean)ReflectionUtils.invokeMethod(method, redisProperties)) {
prefix = REDISS_PROTOCOL_PREFIX; prefix = REDISS_PROTOCOL_PREFIX;
} }
config.useSingleServer() config.useSingleServer()
.setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort()) .setAddress(prefix + redisProperties.getHost() + ":" + redisProperties.getPort())
.setConnectTimeout(timeout) .setConnectTimeout(timeout)
@ -204,5 +204,5 @@ public class RedissonAutoConfiguration {
return is; return is;
} }
} }

Loading…
Cancel
Save