github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix compilation issue

Browse Source
pull/2173/head
Zhelyazko Chobantonov 6 years ago
parent 6934b23c96
commit 3b270383bc
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File

7
redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
Unescape Escape View File

@ -16,7 +16,6 @@
package org.redisson.spring.data.connection; package org.redisson.spring.data.connection;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet; import java.util.HashSet;
@ -25,7 +24,7 @@ import java.util.Set;
import org.redisson.client.handler.State; import org.redisson.client.handler.State;
import org.redisson.client.protocol.Decoder; import org.redisson.client.protocol.Decoder;
import org.redisson.misc.URIBuilder; import org.redisson.misc.RedisURI;
import org.springframework.data.redis.connection.RedisClusterNode; import org.springframework.data.redis.connection.RedisClusterNode;
import org.springframework.data.redis.connection.RedisClusterNode.Flag; import org.springframework.data.redis.connection.RedisClusterNode.Flag;
import org.springframework.data.redis.connection.RedisClusterNode.LinkState; import org.springframework.data.redis.connection.RedisClusterNode.LinkState;
@ -60,10 +59,10 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
flags.add(Flag.valueOf(flagValue)); flags.add(Flag.valueOf(flagValue));
} }
URI address = null; RedisURI address = null;
if (!flags.contains(Flag.NOADDR)) { if (!flags.contains(Flag.NOADDR)) {
String addr = params[1].split("@")[0]; String addr = params[1].split("@")[0];
address = URIBuilder.create("redis://" + addr); address = new RedisURI("redis://" + addr);
} }
String masterId = params[3]; String masterId = params[3];

7
redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
Unescape Escape View File

@ -16,7 +16,6 @@
package org.redisson.spring.data.connection; package org.redisson.spring.data.connection;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet; import java.util.HashSet;
@ -25,7 +24,7 @@ import java.util.Set;
import org.redisson.client.handler.State; import org.redisson.client.handler.State;
import org.redisson.client.protocol.Decoder; import org.redisson.client.protocol.Decoder;
import org.redisson.misc.URIBuilder; import org.redisson.misc.RedisURI;
import org.springframework.data.redis.connection.RedisClusterNode; import org.springframework.data.redis.connection.RedisClusterNode;
import org.springframework.data.redis.connection.RedisClusterNode.Flag; import org.springframework.data.redis.connection.RedisClusterNode.Flag;
import org.springframework.data.redis.connection.RedisClusterNode.LinkState; import org.springframework.data.redis.connection.RedisClusterNode.LinkState;
@ -60,10 +59,10 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
flags.add(Flag.valueOf(flagValue)); flags.add(Flag.valueOf(flagValue));
} }
URI address = null; RedisURI address = null;
if (!flags.contains(Flag.NOADDR)) { if (!flags.contains(Flag.NOADDR)) {
String addr = params[1].split("@")[0]; String addr = params[1].split("@")[0];
address = URIBuilder.create("redis://" + addr); address = new RedisURI("redis://" + addr);
} }
String masterId = params[3]; String masterId = params[3];

7
redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
Unescape Escape View File

@ -16,7 +16,6 @@
package org.redisson.spring.data.connection; package org.redisson.spring.data.connection;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet; import java.util.HashSet;
@ -25,7 +24,7 @@ import java.util.Set;
import org.redisson.client.handler.State; import org.redisson.client.handler.State;
import org.redisson.client.protocol.Decoder; import org.redisson.client.protocol.Decoder;
import org.redisson.misc.URIBuilder; import org.redisson.misc.RedisURI;
import org.springframework.data.redis.connection.RedisClusterNode; import org.springframework.data.redis.connection.RedisClusterNode;
import org.springframework.data.redis.connection.RedisClusterNode.Flag; import org.springframework.data.redis.connection.RedisClusterNode.Flag;
import org.springframework.data.redis.connection.RedisClusterNode.LinkState; import org.springframework.data.redis.connection.RedisClusterNode.LinkState;
@ -60,10 +59,10 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
flags.add(Flag.valueOf(flagValue)); flags.add(Flag.valueOf(flagValue));
} }
URI address = null; RedisURI address = null;
if (!flags.contains(Flag.NOADDR)) { if (!flags.contains(Flag.NOADDR)) {
String addr = params[1].split("@")[0]; String addr = params[1].split("@")[0];
address = URIBuilder.create("redis://" + addr); address = new RedisURI("redis://" + addr);
} }
String masterId = params[3]; String masterId = params[3];

7
redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
Unescape Escape View File

@ -16,7 +16,6 @@
package org.redisson.spring.data.connection; package org.redisson.spring.data.connection;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet; import java.util.HashSet;
@ -25,7 +24,7 @@ import java.util.Set;
import org.redisson.client.handler.State; import org.redisson.client.handler.State;
import org.redisson.client.protocol.Decoder; import org.redisson.client.protocol.Decoder;
import org.redisson.misc.URIBuilder; import org.redisson.misc.RedisURI;
import org.springframework.data.redis.connection.RedisClusterNode; import org.springframework.data.redis.connection.RedisClusterNode;
import org.springframework.data.redis.connection.RedisClusterNode.Flag; import org.springframework.data.redis.connection.RedisClusterNode.Flag;
import org.springframework.data.redis.connection.RedisClusterNode.LinkState; import org.springframework.data.redis.connection.RedisClusterNode.LinkState;
@ -60,10 +59,10 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
flags.add(Flag.valueOf(flagValue)); flags.add(Flag.valueOf(flagValue));
} }
URI address = null; RedisURI address = null;
if (!flags.contains(Flag.NOADDR)) { if (!flags.contains(Flag.NOADDR)) {
String addr = params[1].split("@")[0]; String addr = params[1].split("@")[0];
address = URIBuilder.create("redis://" + addr); address = new RedisURI("redis://" + addr);
} }
String masterId = params[3]; String masterId = params[3];

Write Preview
Loading…
Cancel
Save