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

refactoring

Browse Source
pull/1344/head
Nikita 7 years ago
parent 6adb539de1
commit 3aea85ab03
7 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File

5
redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
Unescape Escape View File

@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
@ -88,8 +89,8 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
private AddressResolver<InetSocketAddress> resolver;
public ClusterConnectionManager(ClusterServersConfig cfg, Config config) {
super(config);
public ClusterConnectionManager(ClusterServersConfig cfg, Config config, UUID id) {
super(config, id);
this.config = create(cfg);
initTimer(this.config);

15
redisson/src/main/java/org/redisson/config/ConfigSupport.java
Unescape Escape View File

@ -25,6 +25,7 @@ import java.lang.reflect.Modifier;
import java.net.URI;
import java.net.URL;
import java.util.List;
import java.util.UUID;
import org.redisson.api.RedissonNodeInitializer;
import org.redisson.client.codec.Codec;
@ -223,24 +224,26 @@ public class ConfigSupport {
}
public static ConnectionManager createConnectionManager(Config configCopy) {
UUID id = UUID.randomUUID();
if (configCopy.getMasterSlaveServersConfig() != null) {
validate(configCopy.getMasterSlaveServersConfig());
return new MasterSlaveConnectionManager(configCopy.getMasterSlaveServersConfig(), configCopy);
return new MasterSlaveConnectionManager(configCopy.getMasterSlaveServersConfig(), configCopy, id);
} else if (configCopy.getSingleServerConfig() != null) {
validate(configCopy.getSingleServerConfig());
return new SingleConnectionManager(configCopy.getSingleServerConfig(), configCopy);
return new SingleConnectionManager(configCopy.getSingleServerConfig(), configCopy, id);
} else if (configCopy.getSentinelServersConfig() != null) {
validate(configCopy.getSentinelServersConfig());
return new SentinelConnectionManager(configCopy.getSentinelServersConfig(), configCopy);
return new SentinelConnectionManager(configCopy.getSentinelServersConfig(), configCopy, id);
} else if (configCopy.getClusterServersConfig() != null) {
validate(configCopy.getClusterServersConfig());
return new ClusterConnectionManager(configCopy.getClusterServersConfig(), configCopy);
return new ClusterConnectionManager(configCopy.getClusterServersConfig(), configCopy, id);
} else if (configCopy.getElasticacheServersConfig() != null) {
validate(configCopy.getElasticacheServersConfig());
return new ElasticacheConnectionManager(configCopy.getElasticacheServersConfig(), configCopy);
return new ElasticacheConnectionManager(configCopy.getElasticacheServersConfig(), configCopy, id);
} else if (configCopy.getReplicatedServersConfig() != null) {
validate(configCopy.getReplicatedServersConfig());
return new ReplicatedConnectionManager(configCopy.getReplicatedServersConfig(), configCopy);
return new ReplicatedConnectionManager(configCopy.getReplicatedServersConfig(), configCopy, id);
} else if (configCopy.getConnectionManager() != null) {
return configCopy.getConnectionManager();
}else {

6
redisson/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java
Unescape Escape View File

@ -15,14 +15,16 @@
*/
package org.redisson.connection;
import java.util.UUID;
import org.redisson.config.Config;
import org.redisson.config.ElasticacheServersConfig;
@Deprecated
public class ElasticacheConnectionManager extends ReplicatedConnectionManager {
public ElasticacheConnectionManager(ElasticacheServersConfig cfg, Config config) {
super(cfg, config);
public ElasticacheConnectionManager(ElasticacheServersConfig cfg, Config config, UUID id) {
super(cfg, config, id);
}
}

9
redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
Unescape Escape View File

@ -111,7 +111,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
}
};
protected final UUID id = UUID.randomUUID();
protected final UUID id;
public static final int MAX_SLOT = 16384;
@ -162,15 +162,16 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
}
}
public MasterSlaveConnectionManager(MasterSlaveServersConfig cfg, Config config) {
this(config);
public MasterSlaveConnectionManager(MasterSlaveServersConfig cfg, Config config, UUID id) {
this(config, id);
this.config = cfg;
initTimer(cfg);
initSingleEntry();
}
public MasterSlaveConnectionManager(Config cfg) {
protected MasterSlaveConnectionManager(Config cfg, UUID id) {
this.id = id;
Version.logVersion();
if (cfg.getTransportMode() == TransportMode.EPOLL) {

5
redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java
Unescape Escape View File

@ -17,6 +17,7 @@ package org.redisson.connection;
import java.net.URI;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
@ -60,8 +61,8 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager {
slave
}
public ReplicatedConnectionManager(ReplicatedServersConfig cfg, Config config) {
super(config);
public ReplicatedConnectionManager(ReplicatedServersConfig cfg, Config config, UUID id) {
super(config, id);
this.config = create(cfg);
initTimer(this.config);

5
redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
Unescape Escape View File

@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@ -76,8 +77,8 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
private ScheduledFuture<?> monitorFuture;
private AddressResolver<InetSocketAddress> sentinelResolver;
public SentinelConnectionManager(SentinelServersConfig cfg, Config config) {
super(config);
public SentinelConnectionManager(SentinelServersConfig cfg, Config config, UUID id) {
super(config, id);
if (cfg.getMasterName() == null) {
throw new IllegalArgumentException("masterName parameter is not defined!");

6
redisson/src/main/java/org/redisson/connection/SingleConnectionManager.java
Unescape Escape View File

@ -15,6 +15,8 @@
*/
package org.redisson.connection;
import java.util.UUID;
import org.redisson.config.Config;
import org.redisson.config.MasterSlaveServersConfig;
import org.redisson.config.ReadMode;
@ -28,8 +30,8 @@ import org.redisson.config.SubscriptionMode;
*/
public class SingleConnectionManager extends MasterSlaveConnectionManager {
public SingleConnectionManager(SingleServerConfig cfg, Config config) {
super(create(cfg), config);
public SingleConnectionManager(SingleServerConfig cfg, Config config, UUID id) {
super(create(cfg), config, id);
}
private static MasterSlaveServersConfig create(SingleServerConfig cfg) {

Write Preview
Loading…
Cancel
Save