From 4320879f3a811db9b6e7aaef3623ba9f968e64f9 Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 26 Jul 2016 11:45:44 +0300 Subject: [PATCH] Move all config classes to org.redisson.config package #492 --- src/main/java/org/redisson/Redisson.java | 64 ++++--------------- .../java/org/redisson/RedissonClient.java | 1 + .../java/org/redisson/RedissonReactive.java | 26 ++------ .../redisson/api/RedissonReactiveClient.java | 2 +- .../cluster/ClusterConnectionListener.java | 2 +- .../cluster/ClusterConnectionManager.java | 6 +- .../org/redisson/{ => config}/BaseConfig.java | 2 +- .../BaseMasterSlaveServersConfig.java | 3 +- .../{ => config}/ClusterServersConfig.java | 3 +- .../org/redisson/{ => config}/Config.java | 2 +- .../redisson/{ => config}/ConfigSupport.java | 49 +++++++++++++- .../ElasticacheServersConfig.java | 2 +- .../MasterSlaveServersConfig.java | 2 +- .../{ => config}/SentinelServersConfig.java | 2 +- .../{ => config}/SingleServerConfig.java | 2 +- .../connection/ClientConnectionsEntry.java | 2 +- .../connection/ConnectionInitializer.java | 2 +- .../connection/ConnectionManager.java | 2 +- .../connection/DefaultConnectionListener.java | 2 +- .../ElasticacheConnectionManager.java | 8 +-- .../connection/IdleConnectionWatcher.java | 2 +- .../MasterSlaveConnectionManager.java | 6 +- .../redisson/connection/MasterSlaveEntry.java | 2 +- .../connection/SentinelConnectionManager.java | 8 +-- .../connection/SingleConnectionManager.java | 6 +- .../org/redisson/connection/SingleEntry.java | 2 +- .../balancer/LoadBalancerManagerImpl.java | 2 +- .../connection/pool/ConnectionPool.java | 2 +- .../connection/pool/MasterConnectionPool.java | 2 +- .../connection/pool/PubSubConnectionPool.java | 2 +- .../pool/SinglePubSubConnectionPool.java | 2 +- .../connection/pool/SlaveConnectionPool.java | 2 +- .../java/org/redisson/BaseReactiveTest.java | 1 + src/test/java/org/redisson/BaseTest.java | 1 + .../redisson/RedissonBlockingQueueTest.java | 1 + .../java/org/redisson/RedissonCodecTest.java | 1 + .../java/org/redisson/RedissonMapTest.java | 1 + .../org/redisson/RedissonMultiLockTest.java | 1 + .../org/redisson/RedissonRedLockTest.java | 1 + src/test/java/org/redisson/RedissonTest.java | 1 + .../redisson/RedissonTopicPatternTest.java | 1 + .../java/org/redisson/RedissonTopicTest.java | 1 + .../org/redisson/RedissonTwoLockedThread.java | 1 + 43 files changed, 120 insertions(+), 113 deletions(-) rename src/main/java/org/redisson/{ => config}/BaseConfig.java (99%) rename src/main/java/org/redisson/{ => config}/BaseMasterSlaveServersConfig.java (99%) rename src/main/java/org/redisson/{ => config}/ClusterServersConfig.java (97%) rename src/main/java/org/redisson/{ => config}/Config.java (99%) rename src/main/java/org/redisson/{ => config}/ConfigSupport.java (65%) rename src/main/java/org/redisson/{ => config}/ElasticacheServersConfig.java (98%) rename src/main/java/org/redisson/{ => config}/MasterSlaveServersConfig.java (99%) rename src/main/java/org/redisson/{ => config}/SentinelServersConfig.java (98%) rename src/main/java/org/redisson/{ => config}/SingleServerConfig.java (99%) diff --git a/src/main/java/org/redisson/Redisson.java b/src/main/java/org/redisson/Redisson.java index 7752ebd47..6e9fdad61 100755 --- a/src/main/java/org/redisson/Redisson.java +++ b/src/main/java/org/redisson/Redisson.java @@ -26,19 +26,6 @@ import java.util.Map.Entry; import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.redisson.api.RedissonReactiveClient; -import org.redisson.client.codec.Codec; -import org.redisson.client.protocol.RedisCommands; -import org.redisson.cluster.ClusterConnectionManager; -import org.redisson.command.CommandExecutor; -import org.redisson.command.CommandSyncService; -import org.redisson.connection.ConnectionManager; -import org.redisson.connection.ElasticacheConnectionManager; -import org.redisson.connection.MasterSlaveConnectionManager; -import org.redisson.connection.SentinelConnectionManager; -import org.redisson.connection.SingleConnectionManager; -import org.redisson.liveobject.provider.CodecProvider; -import org.redisson.liveobject.provider.DefaultCodecProvider; import org.redisson.api.ClusterNodesGroup; import org.redisson.api.Node; import org.redisson.api.NodesGroup; @@ -77,11 +64,21 @@ import org.redisson.api.RSetMultimap; import org.redisson.api.RSetMultimapCache; import org.redisson.api.RSortedSet; import org.redisson.api.RTopic; +import org.redisson.api.RedissonReactiveClient; +import org.redisson.client.codec.Codec; +import org.redisson.client.protocol.RedisCommands; +import org.redisson.command.CommandExecutor; +import org.redisson.command.CommandSyncService; +import org.redisson.config.Config; +import org.redisson.config.ConfigSupport; +import org.redisson.connection.ConnectionManager; +import org.redisson.liveobject.provider.CodecProvider; +import org.redisson.liveobject.provider.DefaultCodecProvider; +import org.redisson.liveobject.provider.DefaultResolverProvider; +import org.redisson.liveobject.provider.ResolverProvider; import io.netty.util.concurrent.Future; import io.netty.util.internal.PlatformDependent; -import org.redisson.liveobject.provider.DefaultResolverProvider; -import org.redisson.liveobject.provider.ResolverProvider; /** * Main infrastructure class allows to get access @@ -108,46 +105,11 @@ public class Redisson implements RedissonClient { this.config = config; Config configCopy = new Config(config); - if (configCopy.getMasterSlaveServersConfig() != null) { - validate(configCopy.getMasterSlaveServersConfig()); - connectionManager = new MasterSlaveConnectionManager(configCopy.getMasterSlaveServersConfig(), configCopy); - } else if (configCopy.getSingleServerConfig() != null) { - validate(configCopy.getSingleServerConfig()); - connectionManager = new SingleConnectionManager(configCopy.getSingleServerConfig(), configCopy); - } else if (configCopy.getSentinelServersConfig() != null) { - validate(configCopy.getSentinelServersConfig()); - connectionManager = new SentinelConnectionManager(configCopy.getSentinelServersConfig(), configCopy); - } else if (configCopy.getClusterServersConfig() != null) { - validate(configCopy.getClusterServersConfig()); - connectionManager = new ClusterConnectionManager(configCopy.getClusterServersConfig(), configCopy); - } else if (configCopy.getElasticacheServersConfig() != null) { - validate(configCopy.getElasticacheServersConfig()); - connectionManager = new ElasticacheConnectionManager(configCopy.getElasticacheServersConfig(), configCopy); - } else { - throw new IllegalArgumentException("server(s) address(es) not defined!"); - } + connectionManager = ConfigSupport.createConnectionManager(configCopy); commandExecutor = new CommandSyncService(connectionManager); evictionScheduler = new EvictionScheduler(commandExecutor); } - private void validate(SingleServerConfig config) { - if (config.getConnectionPoolSize() < config.getConnectionMinimumIdleSize()) { - throw new IllegalArgumentException("connectionPoolSize can't be lower than connectionMinimumIdleSize"); - } - } - - private void validate(BaseMasterSlaveServersConfig config) { - if (config.getSlaveConnectionPoolSize() < config.getSlaveConnectionMinimumIdleSize()) { - throw new IllegalArgumentException("slaveConnectionPoolSize can't be lower than slaveConnectionMinimumIdleSize"); - } - if (config.getMasterConnectionPoolSize() < config.getMasterConnectionMinimumIdleSize()) { - throw new IllegalArgumentException("masterConnectionPoolSize can't be lower than masterConnectionMinimumIdleSize"); - } - if (config.getSlaveSubscriptionConnectionPoolSize() < config.getSlaveSubscriptionConnectionMinimumIdleSize()) { - throw new IllegalArgumentException("slaveSubscriptionConnectionMinimumIdleSize can't be lower than slaveSubscriptionConnectionPoolSize"); - } - } - /** * Create sync/async Redisson instance with default config * diff --git a/src/main/java/org/redisson/RedissonClient.java b/src/main/java/org/redisson/RedissonClient.java index 2dd86c016..06ba276da 100755 --- a/src/main/java/org/redisson/RedissonClient.java +++ b/src/main/java/org/redisson/RedissonClient.java @@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit; import org.redisson.client.codec.Codec; import org.redisson.command.CommandExecutor; +import org.redisson.config.Config; import org.redisson.liveobject.provider.CodecProvider; import org.redisson.api.ClusterNode; import org.redisson.api.ClusterNodesGroup; diff --git a/src/main/java/org/redisson/RedissonReactive.java b/src/main/java/org/redisson/RedissonReactive.java index bd678d7f2..70c7ba55d 100644 --- a/src/main/java/org/redisson/RedissonReactive.java +++ b/src/main/java/org/redisson/RedissonReactive.java @@ -27,12 +27,12 @@ import org.redisson.api.RBatchReactive; import org.redisson.api.RBitSetReactive; import org.redisson.api.RBlockingQueueReactive; import org.redisson.api.RBucketReactive; -import org.redisson.api.RMapCacheReactive; import org.redisson.api.RDequeReactive; import org.redisson.api.RHyperLogLogReactive; import org.redisson.api.RKeysReactive; import org.redisson.api.RLexSortedSetReactive; import org.redisson.api.RListReactive; +import org.redisson.api.RMapCacheReactive; import org.redisson.api.RMapReactive; import org.redisson.api.RPatternTopicReactive; import org.redisson.api.RQueueReactive; @@ -44,24 +44,21 @@ import org.redisson.api.RTopicReactive; import org.redisson.api.RedissonReactiveClient; import org.redisson.client.codec.Codec; import org.redisson.client.protocol.RedisCommands; -import org.redisson.cluster.ClusterConnectionManager; import org.redisson.command.CommandReactiveService; +import org.redisson.config.Config; +import org.redisson.config.ConfigSupport; import org.redisson.connection.ConnectionManager; -import org.redisson.connection.ElasticacheConnectionManager; -import org.redisson.connection.MasterSlaveConnectionManager; -import org.redisson.connection.SentinelConnectionManager; -import org.redisson.connection.SingleConnectionManager; import org.redisson.reactive.RedissonAtomicLongReactive; import org.redisson.reactive.RedissonBatchReactive; import org.redisson.reactive.RedissonBitSetReactive; import org.redisson.reactive.RedissonBlockingQueueReactive; import org.redisson.reactive.RedissonBucketReactive; -import org.redisson.reactive.RedissonMapCacheReactive; import org.redisson.reactive.RedissonDequeReactive; import org.redisson.reactive.RedissonHyperLogLogReactive; import org.redisson.reactive.RedissonKeysReactive; import org.redisson.reactive.RedissonLexSortedSetReactive; import org.redisson.reactive.RedissonListReactive; +import org.redisson.reactive.RedissonMapCacheReactive; import org.redisson.reactive.RedissonMapReactive; import org.redisson.reactive.RedissonPatternTopicReactive; import org.redisson.reactive.RedissonQueueReactive; @@ -90,19 +87,8 @@ public class RedissonReactive implements RedissonReactiveClient { RedissonReactive(Config config) { this.config = config; Config configCopy = new Config(config); - if (configCopy.getMasterSlaveServersConfig() != null) { - connectionManager = new MasterSlaveConnectionManager(configCopy.getMasterSlaveServersConfig(), configCopy); - } else if (configCopy.getSingleServerConfig() != null) { - connectionManager = new SingleConnectionManager(configCopy.getSingleServerConfig(), configCopy); - } else if (configCopy.getSentinelServersConfig() != null) { - connectionManager = new SentinelConnectionManager(configCopy.getSentinelServersConfig(), configCopy); - } else if (configCopy.getClusterServersConfig() != null) { - connectionManager = new ClusterConnectionManager(configCopy.getClusterServersConfig(), configCopy); - } else if (configCopy.getElasticacheServersConfig() != null) { - connectionManager = new ElasticacheConnectionManager(configCopy.getElasticacheServersConfig(), configCopy); - } else { - throw new IllegalArgumentException("server(s) address(es) not defined!"); - } + + connectionManager = ConfigSupport.createConnectionManager(configCopy); commandExecutor = new CommandReactiveService(connectionManager); evictionScheduler = new EvictionScheduler(commandExecutor); } diff --git a/src/main/java/org/redisson/api/RedissonReactiveClient.java b/src/main/java/org/redisson/api/RedissonReactiveClient.java index dacd24066..ae3e6964a 100644 --- a/src/main/java/org/redisson/api/RedissonReactiveClient.java +++ b/src/main/java/org/redisson/api/RedissonReactiveClient.java @@ -17,8 +17,8 @@ package org.redisson.api; import java.util.List; -import org.redisson.Config; import org.redisson.client.codec.Codec; +import org.redisson.config.Config; /** * Main Redisson interface for access diff --git a/src/main/java/org/redisson/cluster/ClusterConnectionListener.java b/src/main/java/org/redisson/cluster/ClusterConnectionListener.java index a0c240a5d..cd921f36d 100644 --- a/src/main/java/org/redisson/cluster/ClusterConnectionListener.java +++ b/src/main/java/org/redisson/cluster/ClusterConnectionListener.java @@ -15,11 +15,11 @@ */ package org.redisson.cluster; -import org.redisson.MasterSlaveServersConfig; import org.redisson.api.NodeType; import org.redisson.client.RedisConnection; import org.redisson.client.RedisException; import org.redisson.client.protocol.RedisCommands; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.DefaultConnectionListener; import org.redisson.connection.FutureConnectionListener; diff --git a/src/main/java/org/redisson/cluster/ClusterConnectionManager.java b/src/main/java/org/redisson/cluster/ClusterConnectionManager.java index 9611514c0..af04cdcac 100644 --- a/src/main/java/org/redisson/cluster/ClusterConnectionManager.java +++ b/src/main/java/org/redisson/cluster/ClusterConnectionManager.java @@ -31,9 +31,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.redisson.ClusterServersConfig; -import org.redisson.Config; -import org.redisson.MasterSlaveServersConfig; import org.redisson.ReadMode; import org.redisson.client.RedisClient; import org.redisson.client.RedisConnection; @@ -41,6 +38,9 @@ import org.redisson.client.RedisConnectionException; import org.redisson.client.RedisException; import org.redisson.client.protocol.RedisCommands; import org.redisson.cluster.ClusterNodeInfo.Flag; +import org.redisson.config.ClusterServersConfig; +import org.redisson.config.Config; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.CRC16; import org.redisson.connection.ClientConnectionsEntry.FreezeReason; import org.redisson.connection.MasterSlaveConnectionManager; diff --git a/src/main/java/org/redisson/BaseConfig.java b/src/main/java/org/redisson/config/BaseConfig.java similarity index 99% rename from src/main/java/org/redisson/BaseConfig.java rename to src/main/java/org/redisson/config/BaseConfig.java index 80c99ec3c..a7b9f0211 100644 --- a/src/main/java/org/redisson/BaseConfig.java +++ b/src/main/java/org/redisson/config/BaseConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson; +package org.redisson.config; class BaseConfig> { diff --git a/src/main/java/org/redisson/BaseMasterSlaveServersConfig.java b/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java similarity index 99% rename from src/main/java/org/redisson/BaseMasterSlaveServersConfig.java rename to src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java index 93e9f25df..831dace88 100644 --- a/src/main/java/org/redisson/BaseMasterSlaveServersConfig.java +++ b/src/main/java/org/redisson/config/BaseMasterSlaveServersConfig.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson; +package org.redisson.config; +import org.redisson.ReadMode; import org.redisson.connection.balancer.LoadBalancer; import org.redisson.connection.balancer.RoundRobinLoadBalancer; diff --git a/src/main/java/org/redisson/ClusterServersConfig.java b/src/main/java/org/redisson/config/ClusterServersConfig.java similarity index 97% rename from src/main/java/org/redisson/ClusterServersConfig.java rename to src/main/java/org/redisson/config/ClusterServersConfig.java index f52a4e458..235f6fffe 100644 --- a/src/main/java/org/redisson/ClusterServersConfig.java +++ b/src/main/java/org/redisson/config/ClusterServersConfig.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson; +package org.redisson.config; import java.net.URI; import java.util.ArrayList; import java.util.List; +import org.redisson.ReadMode; import org.redisson.misc.URIBuilder; public class ClusterServersConfig extends BaseMasterSlaveServersConfig { diff --git a/src/main/java/org/redisson/Config.java b/src/main/java/org/redisson/config/Config.java similarity index 99% rename from src/main/java/org/redisson/Config.java rename to src/main/java/org/redisson/config/Config.java index b85c1d4ff..6850a3c20 100644 --- a/src/main/java/org/redisson/Config.java +++ b/src/main/java/org/redisson/config/Config.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson; +package org.redisson.config; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/redisson/ConfigSupport.java b/src/main/java/org/redisson/config/ConfigSupport.java similarity index 65% rename from src/main/java/org/redisson/ConfigSupport.java rename to src/main/java/org/redisson/config/ConfigSupport.java index 3b27f2c7a..f71a2b239 100644 --- a/src/main/java/org/redisson/ConfigSupport.java +++ b/src/main/java/org/redisson/config/ConfigSupport.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson; +package org.redisson.config; import java.io.File; import java.io.IOException; @@ -24,6 +24,12 @@ import java.net.URL; import java.util.List; import org.redisson.client.codec.Codec; +import org.redisson.cluster.ClusterConnectionManager; +import org.redisson.connection.ConnectionManager; +import org.redisson.connection.ElasticacheConnectionManager; +import org.redisson.connection.MasterSlaveConnectionManager; +import org.redisson.connection.SentinelConnectionManager; +import org.redisson.connection.SingleConnectionManager; import org.redisson.connection.balancer.LoadBalancer; import com.fasterxml.jackson.annotation.JsonFilter; @@ -149,7 +155,46 @@ public class ConfigSupport { public String toYAML(Config config) throws IOException { return yamlMapper.writeValueAsString(config); } - + + public static ConnectionManager createConnectionManager(Config configCopy) { + if (configCopy.getMasterSlaveServersConfig() != null) { + validate(configCopy.getMasterSlaveServersConfig()); + return new MasterSlaveConnectionManager(configCopy.getMasterSlaveServersConfig(), configCopy); + } else if (configCopy.getSingleServerConfig() != null) { + validate(configCopy.getSingleServerConfig()); + return new SingleConnectionManager(configCopy.getSingleServerConfig(), configCopy); + } else if (configCopy.getSentinelServersConfig() != null) { + validate(configCopy.getSentinelServersConfig()); + return new SentinelConnectionManager(configCopy.getSentinelServersConfig(), configCopy); + } else if (configCopy.getClusterServersConfig() != null) { + validate(configCopy.getClusterServersConfig()); + return new ClusterConnectionManager(configCopy.getClusterServersConfig(), configCopy); + } else if (configCopy.getElasticacheServersConfig() != null) { + validate(configCopy.getElasticacheServersConfig()); + return new ElasticacheConnectionManager(configCopy.getElasticacheServersConfig(), configCopy); + } else { + throw new IllegalArgumentException("server(s) address(es) not defined!"); + } + + } + + private static void validate(SingleServerConfig config) { + if (config.getConnectionPoolSize() < config.getConnectionMinimumIdleSize()) { + throw new IllegalArgumentException("connectionPoolSize can't be lower than connectionMinimumIdleSize"); + } + } + + private static void validate(BaseMasterSlaveServersConfig config) { + if (config.getSlaveConnectionPoolSize() < config.getSlaveConnectionMinimumIdleSize()) { + throw new IllegalArgumentException("slaveConnectionPoolSize can't be lower than slaveConnectionMinimumIdleSize"); + } + if (config.getMasterConnectionPoolSize() < config.getMasterConnectionMinimumIdleSize()) { + throw new IllegalArgumentException("masterConnectionPoolSize can't be lower than masterConnectionMinimumIdleSize"); + } + if (config.getSlaveSubscriptionConnectionPoolSize() < config.getSlaveSubscriptionConnectionMinimumIdleSize()) { + throw new IllegalArgumentException("slaveSubscriptionConnectionMinimumIdleSize can't be lower than slaveSubscriptionConnectionPoolSize"); + } + } private ObjectMapper createMapper(JsonFactory mapping) { ObjectMapper mapper = new ObjectMapper(mapping); diff --git a/src/main/java/org/redisson/ElasticacheServersConfig.java b/src/main/java/org/redisson/config/ElasticacheServersConfig.java similarity index 98% rename from src/main/java/org/redisson/ElasticacheServersConfig.java rename to src/main/java/org/redisson/config/ElasticacheServersConfig.java index 593f1a3bb..2660b4861 100644 --- a/src/main/java/org/redisson/ElasticacheServersConfig.java +++ b/src/main/java/org/redisson/config/ElasticacheServersConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson; +package org.redisson.config; import java.net.URI; import java.util.ArrayList; diff --git a/src/main/java/org/redisson/MasterSlaveServersConfig.java b/src/main/java/org/redisson/config/MasterSlaveServersConfig.java similarity index 99% rename from src/main/java/org/redisson/MasterSlaveServersConfig.java rename to src/main/java/org/redisson/config/MasterSlaveServersConfig.java index e82f388dc..de58ce067 100644 --- a/src/main/java/org/redisson/MasterSlaveServersConfig.java +++ b/src/main/java/org/redisson/config/MasterSlaveServersConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson; +package org.redisson.config; import java.net.URI; import java.util.Collections; diff --git a/src/main/java/org/redisson/SentinelServersConfig.java b/src/main/java/org/redisson/config/SentinelServersConfig.java similarity index 98% rename from src/main/java/org/redisson/SentinelServersConfig.java rename to src/main/java/org/redisson/config/SentinelServersConfig.java index 0897a09fa..17e9e8694 100644 --- a/src/main/java/org/redisson/SentinelServersConfig.java +++ b/src/main/java/org/redisson/config/SentinelServersConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson; +package org.redisson.config; import java.net.URI; import java.util.ArrayList; diff --git a/src/main/java/org/redisson/SingleServerConfig.java b/src/main/java/org/redisson/config/SingleServerConfig.java similarity index 99% rename from src/main/java/org/redisson/SingleServerConfig.java rename to src/main/java/org/redisson/config/SingleServerConfig.java index 876f0d042..03cc6415d 100644 --- a/src/main/java/org/redisson/SingleServerConfig.java +++ b/src/main/java/org/redisson/config/SingleServerConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.redisson; +package org.redisson.config; import java.net.URI; import java.util.Collections; diff --git a/src/main/java/org/redisson/connection/ClientConnectionsEntry.java b/src/main/java/org/redisson/connection/ClientConnectionsEntry.java index 50d3fc20e..2050050a6 100644 --- a/src/main/java/org/redisson/connection/ClientConnectionsEntry.java +++ b/src/main/java/org/redisson/connection/ClientConnectionsEntry.java @@ -19,12 +19,12 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; -import org.redisson.MasterSlaveServersConfig; import org.redisson.api.NodeType; import org.redisson.client.ReconnectListener; import org.redisson.client.RedisClient; import org.redisson.client.RedisConnection; import org.redisson.client.RedisPubSubConnection; +import org.redisson.config.MasterSlaveServersConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/redisson/connection/ConnectionInitializer.java b/src/main/java/org/redisson/connection/ConnectionInitializer.java index 29b0ad39e..124ace6b5 100644 --- a/src/main/java/org/redisson/connection/ConnectionInitializer.java +++ b/src/main/java/org/redisson/connection/ConnectionInitializer.java @@ -15,9 +15,9 @@ */ package org.redisson.connection; -import org.redisson.MasterSlaveServersConfig; import org.redisson.api.NodeType; import org.redisson.client.RedisConnection; +import org.redisson.config.MasterSlaveServersConfig; import io.netty.util.concurrent.Promise; diff --git a/src/main/java/org/redisson/connection/ConnectionManager.java b/src/main/java/org/redisson/connection/ConnectionManager.java index b875d9af9..0b1243b7f 100644 --- a/src/main/java/org/redisson/connection/ConnectionManager.java +++ b/src/main/java/org/redisson/connection/ConnectionManager.java @@ -22,13 +22,13 @@ import java.util.Set; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import org.redisson.MasterSlaveServersConfig; import org.redisson.api.NodeType; import org.redisson.client.RedisClient; import org.redisson.client.RedisConnection; import org.redisson.client.RedisPubSubListener; import org.redisson.client.codec.Codec; import org.redisson.client.protocol.RedisCommand; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.misc.InfinitySemaphoreLatch; import io.netty.channel.EventLoopGroup; diff --git a/src/main/java/org/redisson/connection/DefaultConnectionListener.java b/src/main/java/org/redisson/connection/DefaultConnectionListener.java index 30498928f..534723474 100644 --- a/src/main/java/org/redisson/connection/DefaultConnectionListener.java +++ b/src/main/java/org/redisson/connection/DefaultConnectionListener.java @@ -15,11 +15,11 @@ */ package org.redisson.connection; -import org.redisson.MasterSlaveServersConfig; import org.redisson.api.NodeType; import org.redisson.client.RedisConnection; import org.redisson.client.RedisException; import org.redisson.client.protocol.RedisCommands; +import org.redisson.config.MasterSlaveServersConfig; import io.netty.util.concurrent.Promise; diff --git a/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java b/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java index 4844a97df..b7d894788 100644 --- a/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java +++ b/src/main/java/org/redisson/connection/ElasticacheConnectionManager.java @@ -21,15 +21,15 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.redisson.BaseMasterSlaveServersConfig; -import org.redisson.Config; -import org.redisson.ElasticacheServersConfig; -import org.redisson.MasterSlaveServersConfig; import org.redisson.client.RedisClient; import org.redisson.client.RedisConnection; import org.redisson.client.RedisConnectionException; import org.redisson.client.RedisException; import org.redisson.client.protocol.RedisCommands; +import org.redisson.config.BaseMasterSlaveServersConfig; +import org.redisson.config.Config; +import org.redisson.config.ElasticacheServersConfig; +import org.redisson.config.MasterSlaveServersConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/redisson/connection/IdleConnectionWatcher.java b/src/main/java/org/redisson/connection/IdleConnectionWatcher.java index 6fc92b2cf..c96852a2e 100644 --- a/src/main/java/org/redisson/connection/IdleConnectionWatcher.java +++ b/src/main/java/org/redisson/connection/IdleConnectionWatcher.java @@ -21,8 +21,8 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.redisson.MasterSlaveServersConfig; import org.redisson.client.RedisConnection; +import org.redisson.config.MasterSlaveServersConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java index d20fe8914..949018959 100644 --- a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java +++ b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java @@ -31,9 +31,6 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import org.redisson.BaseMasterSlaveServersConfig; -import org.redisson.Config; -import org.redisson.MasterSlaveServersConfig; import org.redisson.ReadMode; import org.redisson.Version; import org.redisson.api.NodeType; @@ -47,6 +44,9 @@ import org.redisson.client.codec.Codec; import org.redisson.client.protocol.RedisCommand; import org.redisson.client.protocol.pubsub.PubSubType; import org.redisson.cluster.ClusterSlotRange; +import org.redisson.config.BaseMasterSlaveServersConfig; +import org.redisson.config.Config; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.ClientConnectionsEntry.FreezeReason; import org.redisson.misc.InfinitySemaphoreLatch; import org.slf4j.Logger; diff --git a/src/main/java/org/redisson/connection/MasterSlaveEntry.java b/src/main/java/org/redisson/connection/MasterSlaveEntry.java index f49a39fd5..a6b5732f3 100644 --- a/src/main/java/org/redisson/connection/MasterSlaveEntry.java +++ b/src/main/java/org/redisson/connection/MasterSlaveEntry.java @@ -25,7 +25,6 @@ import java.util.Set; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicBoolean; -import org.redisson.MasterSlaveServersConfig; import org.redisson.ReadMode; import org.redisson.api.NodeType; import org.redisson.client.RedisClient; @@ -35,6 +34,7 @@ import org.redisson.client.RedisPubSubListener; import org.redisson.client.codec.Codec; import org.redisson.client.protocol.CommandData; import org.redisson.cluster.ClusterSlotRange; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.ClientConnectionsEntry.FreezeReason; import org.redisson.connection.balancer.LoadBalancerManager; import org.redisson.connection.balancer.LoadBalancerManagerImpl; diff --git a/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/src/main/java/org/redisson/connection/SentinelConnectionManager.java index 5d6a07fca..b1f9f45a3 100755 --- a/src/main/java/org/redisson/connection/SentinelConnectionManager.java +++ b/src/main/java/org/redisson/connection/SentinelConnectionManager.java @@ -25,11 +25,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; -import org.redisson.BaseMasterSlaveServersConfig; -import org.redisson.Config; -import org.redisson.MasterSlaveServersConfig; import org.redisson.ReadMode; -import org.redisson.SentinelServersConfig; import org.redisson.client.BaseRedisPubSubListener; import org.redisson.client.RedisClient; import org.redisson.client.RedisConnection; @@ -39,6 +35,10 @@ import org.redisson.client.codec.StringCodec; import org.redisson.client.protocol.RedisCommands; import org.redisson.client.protocol.pubsub.PubSubType; import org.redisson.cluster.ClusterSlotRange; +import org.redisson.config.BaseMasterSlaveServersConfig; +import org.redisson.config.Config; +import org.redisson.config.MasterSlaveServersConfig; +import org.redisson.config.SentinelServersConfig; import org.redisson.connection.ClientConnectionsEntry.FreezeReason; import org.redisson.misc.URIBuilder; import org.slf4j.Logger; diff --git a/src/main/java/org/redisson/connection/SingleConnectionManager.java b/src/main/java/org/redisson/connection/SingleConnectionManager.java index d7a97afd2..99ac46598 100644 --- a/src/main/java/org/redisson/connection/SingleConnectionManager.java +++ b/src/main/java/org/redisson/connection/SingleConnectionManager.java @@ -20,11 +20,11 @@ import java.net.UnknownHostException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.redisson.Config; -import org.redisson.MasterSlaveServersConfig; import org.redisson.ReadMode; -import org.redisson.SingleServerConfig; import org.redisson.client.RedisConnectionException; +import org.redisson.config.Config; +import org.redisson.config.MasterSlaveServersConfig; +import org.redisson.config.SingleServerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/redisson/connection/SingleEntry.java b/src/main/java/org/redisson/connection/SingleEntry.java index 8e2b743c9..85ca21e7a 100644 --- a/src/main/java/org/redisson/connection/SingleEntry.java +++ b/src/main/java/org/redisson/connection/SingleEntry.java @@ -19,12 +19,12 @@ import java.net.InetSocketAddress; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.redisson.MasterSlaveServersConfig; import org.redisson.api.NodeType; import org.redisson.client.RedisClient; import org.redisson.client.RedisConnection; import org.redisson.client.RedisPubSubConnection; import org.redisson.cluster.ClusterSlotRange; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.pool.PubSubConnectionPool; import org.redisson.connection.pool.SinglePubSubConnectionPool; diff --git a/src/main/java/org/redisson/connection/balancer/LoadBalancerManagerImpl.java b/src/main/java/org/redisson/connection/balancer/LoadBalancerManagerImpl.java index 0d83bb236..921c8b0dd 100644 --- a/src/main/java/org/redisson/connection/balancer/LoadBalancerManagerImpl.java +++ b/src/main/java/org/redisson/connection/balancer/LoadBalancerManagerImpl.java @@ -19,10 +19,10 @@ import java.net.InetSocketAddress; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.redisson.MasterSlaveServersConfig; import org.redisson.client.RedisConnection; import org.redisson.client.RedisConnectionException; import org.redisson.client.RedisPubSubConnection; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.ClientConnectionsEntry; import org.redisson.connection.ClientConnectionsEntry.FreezeReason; import org.redisson.connection.ConnectionManager; diff --git a/src/main/java/org/redisson/connection/pool/ConnectionPool.java b/src/main/java/org/redisson/connection/pool/ConnectionPool.java index 46e242f66..cf1ad64d0 100644 --- a/src/main/java/org/redisson/connection/pool/ConnectionPool.java +++ b/src/main/java/org/redisson/connection/pool/ConnectionPool.java @@ -22,11 +22,11 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.redisson.MasterSlaveServersConfig; import org.redisson.api.NodeType; import org.redisson.client.RedisConnection; import org.redisson.client.RedisConnectionException; import org.redisson.client.protocol.RedisCommands; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.ClientConnectionsEntry; import org.redisson.connection.ClientConnectionsEntry.FreezeReason; import org.redisson.connection.ConnectionManager; diff --git a/src/main/java/org/redisson/connection/pool/MasterConnectionPool.java b/src/main/java/org/redisson/connection/pool/MasterConnectionPool.java index 23c7f066d..1661ef4dc 100644 --- a/src/main/java/org/redisson/connection/pool/MasterConnectionPool.java +++ b/src/main/java/org/redisson/connection/pool/MasterConnectionPool.java @@ -15,8 +15,8 @@ */ package org.redisson.connection.pool; -import org.redisson.MasterSlaveServersConfig; import org.redisson.client.RedisConnection; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.ConnectionManager; import org.redisson.connection.MasterSlaveEntry; import org.redisson.connection.ClientConnectionsEntry; diff --git a/src/main/java/org/redisson/connection/pool/PubSubConnectionPool.java b/src/main/java/org/redisson/connection/pool/PubSubConnectionPool.java index d1a64fad1..7efd5d0f0 100644 --- a/src/main/java/org/redisson/connection/pool/PubSubConnectionPool.java +++ b/src/main/java/org/redisson/connection/pool/PubSubConnectionPool.java @@ -15,8 +15,8 @@ */ package org.redisson.connection.pool; -import org.redisson.MasterSlaveServersConfig; import org.redisson.client.RedisPubSubConnection; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.ConnectionManager; import org.redisson.connection.MasterSlaveEntry; import org.redisson.connection.ClientConnectionsEntry; diff --git a/src/main/java/org/redisson/connection/pool/SinglePubSubConnectionPool.java b/src/main/java/org/redisson/connection/pool/SinglePubSubConnectionPool.java index 1efc5a6b4..f9b40bf3f 100644 --- a/src/main/java/org/redisson/connection/pool/SinglePubSubConnectionPool.java +++ b/src/main/java/org/redisson/connection/pool/SinglePubSubConnectionPool.java @@ -15,7 +15,7 @@ */ package org.redisson.connection.pool; -import org.redisson.MasterSlaveServersConfig; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.ClientConnectionsEntry; import org.redisson.connection.ConnectionManager; import org.redisson.connection.MasterSlaveEntry; diff --git a/src/main/java/org/redisson/connection/pool/SlaveConnectionPool.java b/src/main/java/org/redisson/connection/pool/SlaveConnectionPool.java index 5f54482b1..c066c3f92 100644 --- a/src/main/java/org/redisson/connection/pool/SlaveConnectionPool.java +++ b/src/main/java/org/redisson/connection/pool/SlaveConnectionPool.java @@ -15,8 +15,8 @@ */ package org.redisson.connection.pool; -import org.redisson.MasterSlaveServersConfig; import org.redisson.client.RedisConnection; +import org.redisson.config.MasterSlaveServersConfig; import org.redisson.connection.ClientConnectionsEntry; import org.redisson.connection.ConnectionManager; import org.redisson.connection.MasterSlaveEntry; diff --git a/src/test/java/org/redisson/BaseReactiveTest.java b/src/test/java/org/redisson/BaseReactiveTest.java index a74326825..cbb958fcf 100644 --- a/src/test/java/org/redisson/BaseReactiveTest.java +++ b/src/test/java/org/redisson/BaseReactiveTest.java @@ -11,6 +11,7 @@ import org.reactivestreams.Publisher; import org.redisson.api.RCollectionReactive; import org.redisson.api.RScoredSortedSetReactive; import org.redisson.api.RedissonReactiveClient; +import org.redisson.config.Config; import reactor.rx.Promise; import reactor.rx.Streams; diff --git a/src/test/java/org/redisson/BaseTest.java b/src/test/java/org/redisson/BaseTest.java index 51fdda486..9ee7f0dbf 100644 --- a/src/test/java/org/redisson/BaseTest.java +++ b/src/test/java/org/redisson/BaseTest.java @@ -5,6 +5,7 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.redisson.config.Config; public abstract class BaseTest { diff --git a/src/test/java/org/redisson/RedissonBlockingQueueTest.java b/src/test/java/org/redisson/RedissonBlockingQueueTest.java index b4f312ddf..076a82e01 100644 --- a/src/test/java/org/redisson/RedissonBlockingQueueTest.java +++ b/src/test/java/org/redisson/RedissonBlockingQueueTest.java @@ -19,6 +19,7 @@ import org.junit.Assert; import org.junit.Test; import org.redisson.RedisRunner.RedisProcess; import org.redisson.api.RBlockingQueue; +import org.redisson.config.Config; import io.netty.util.concurrent.Future; diff --git a/src/test/java/org/redisson/RedissonCodecTest.java b/src/test/java/org/redisson/RedissonCodecTest.java index aac151578..8f6d2574d 100644 --- a/src/test/java/org/redisson/RedissonCodecTest.java +++ b/src/test/java/org/redisson/RedissonCodecTest.java @@ -14,6 +14,7 @@ import org.redisson.codec.LZ4Codec; import org.redisson.codec.MsgPackJacksonCodec; import org.redisson.codec.SerializationCodec; import org.redisson.codec.SnappyCodec; +import org.redisson.config.Config; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/test/java/org/redisson/RedissonMapTest.java b/src/test/java/org/redisson/RedissonMapTest.java index f021f8d61..6bf70e02d 100644 --- a/src/test/java/org/redisson/RedissonMapTest.java +++ b/src/test/java/org/redisson/RedissonMapTest.java @@ -22,6 +22,7 @@ import org.redisson.api.Predicate; import org.redisson.api.RMap; import org.redisson.client.codec.StringCodec; import org.redisson.codec.JsonJacksonCodec; +import org.redisson.config.Config; import io.netty.util.concurrent.Future; diff --git a/src/test/java/org/redisson/RedissonMultiLockTest.java b/src/test/java/org/redisson/RedissonMultiLockTest.java index afc5550c4..c0fc2ad0c 100644 --- a/src/test/java/org/redisson/RedissonMultiLockTest.java +++ b/src/test/java/org/redisson/RedissonMultiLockTest.java @@ -10,6 +10,7 @@ import io.netty.channel.nio.NioEventLoopGroup; import org.redisson.RedisRunner.RedisProcess; import org.redisson.api.RLock; import org.redisson.api.RedissonMultiLock; +import org.redisson.config.Config; import static com.jayway.awaitility.Awaitility.await; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/org/redisson/RedissonRedLockTest.java b/src/test/java/org/redisson/RedissonRedLockTest.java index dc1081976..eafad21bd 100644 --- a/src/test/java/org/redisson/RedissonRedLockTest.java +++ b/src/test/java/org/redisson/RedissonRedLockTest.java @@ -13,6 +13,7 @@ import org.redisson.RedisRunner.RedisProcess; import org.redisson.api.RLock; import org.redisson.api.RedissonMultiLock; import org.redisson.api.RedissonRedLock; +import org.redisson.config.Config; import static com.jayway.awaitility.Awaitility.await; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/org/redisson/RedissonTest.java b/src/test/java/org/redisson/RedissonTest.java index 66c030f40..4227c1152 100644 --- a/src/test/java/org/redisson/RedissonTest.java +++ b/src/test/java/org/redisson/RedissonTest.java @@ -25,6 +25,7 @@ import org.redisson.client.RedisOutOfMemoryException; import org.redisson.client.WriteRedisConnectionException; import org.redisson.client.protocol.decoder.ListScanResult; import org.redisson.codec.SerializationCodec; +import org.redisson.config.Config; import org.redisson.connection.ConnectionListener; import static com.jayway.awaitility.Awaitility.await; diff --git a/src/test/java/org/redisson/RedissonTopicPatternTest.java b/src/test/java/org/redisson/RedissonTopicPatternTest.java index 8823a54da..8950f6bcf 100644 --- a/src/test/java/org/redisson/RedissonTopicPatternTest.java +++ b/src/test/java/org/redisson/RedissonTopicPatternTest.java @@ -28,6 +28,7 @@ import org.redisson.api.PatternStatusListener; import org.redisson.api.RPatternTopic; import org.redisson.api.RTopic; import org.redisson.api.StatusListener; +import org.redisson.config.Config; public class RedissonTopicPatternTest { diff --git a/src/test/java/org/redisson/RedissonTopicTest.java b/src/test/java/org/redisson/RedissonTopicTest.java index 88670b080..6ca7076bf 100644 --- a/src/test/java/org/redisson/RedissonTopicTest.java +++ b/src/test/java/org/redisson/RedissonTopicTest.java @@ -31,6 +31,7 @@ import org.redisson.api.RTopic; import org.redisson.api.StatusListener; import org.redisson.client.codec.LongCodec; import org.redisson.client.codec.StringCodec; +import org.redisson.config.Config; import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.Duration; diff --git a/src/test/java/org/redisson/RedissonTwoLockedThread.java b/src/test/java/org/redisson/RedissonTwoLockedThread.java index e08c89935..9a6e187a6 100644 --- a/src/test/java/org/redisson/RedissonTwoLockedThread.java +++ b/src/test/java/org/redisson/RedissonTwoLockedThread.java @@ -12,6 +12,7 @@ import org.redisson.api.RLock; import org.redisson.client.codec.Codec; import org.redisson.codec.JsonJacksonCodec; import org.redisson.codec.SerializationCodec; +import org.redisson.config.Config; import java.util.Arrays; import java.util.concurrent.CountDownLatch;