From eb0a8363a8919ff04b3a556bb14147e1b5f36fa1 Mon Sep 17 00:00:00 2001 From: Nikita Date: Wed, 10 Feb 2016 15:03:06 +0300 Subject: [PATCH] Code formatting --- src/main/java/org/redisson/BaseConfig.java | 25 +++++++---- src/main/java/org/redisson/Config.java | 14 ++++-- .../client/handler/CommandEncoder.java | 45 +++++++++---------- .../org/redisson/codec/CborJacksonCodec.java | 8 ++-- .../org/redisson/codec/JsonJacksonCodec.java | 12 +++-- 5 files changed, 57 insertions(+), 47 deletions(-) diff --git a/src/main/java/org/redisson/BaseConfig.java b/src/main/java/org/redisson/BaseConfig.java index 4256a7dbc..c021b6ca9 100644 --- a/src/main/java/org/redisson/BaseConfig.java +++ b/src/main/java/org/redisson/BaseConfig.java @@ -15,7 +15,6 @@ */ package org.redisson; - class BaseConfig> { /** @@ -113,6 +112,7 @@ class BaseConfig> { this.subscriptionsPerConnection = subscriptionsPerConnection; return (T) this; } + public int getSubscriptionsPerConnection() { return subscriptionsPerConnection; } @@ -127,6 +127,7 @@ class BaseConfig> { this.password = password; return (T) this; } + public String getPassword() { return password; } @@ -142,6 +143,7 @@ class BaseConfig> { this.retryAttempts = retryAttempts; return (T) this; } + public int getRetryAttempts() { return retryAttempts; } @@ -156,6 +158,7 @@ class BaseConfig> { this.retryInterval = retryInterval; return (T) this; } + public int getRetryInterval() { return retryInterval; } @@ -169,6 +172,7 @@ class BaseConfig> { this.timeout = timeout; return (T) this; } + public int getTimeout() { return timeout; } @@ -183,11 +187,11 @@ class BaseConfig> { this.clientName = clientName; return (T) this; } + public String getClientName() { return clientName; } - /** * Ping timeout used in Node.ping and Node.pingAll operation * @@ -197,13 +201,14 @@ class BaseConfig> { this.pingTimeout = pingTimeout; return (T) this; } + public int getPingTimeout() { return pingTimeout; } /** * Timeout during connecting to any Redis server. - * + *

* @param connectTimeout - timeout in milliseconds * @return */ @@ -211,6 +216,7 @@ class BaseConfig> { this.connectTimeout = connectTimeout; return (T) this; } + public int getConnectTimeout() { return connectTimeout; } @@ -227,6 +233,7 @@ class BaseConfig> { this.idleConnectionTimeout = idleConnectionTimeout; return (T) this; } + public int getIdleConnectionTimeout() { return idleConnectionTimeout; } @@ -234,10 +241,10 @@ class BaseConfig> { /** * Reconnection attempt timeout to Redis server when * it has been excluded from internal list of available servers. - * + *

* On every such timeout event Redisson tries * to connect to disconnected Redis server. - * + *

* Default is 3000 * * @see #failedAttempts @@ -246,8 +253,9 @@ class BaseConfig> { public T setReconnectionTimeout(int slaveRetryTimeout) { this.reconnectionTimeout = slaveRetryTimeout; - return (T)this; + return (T) this; } + public int getReconnectionTimeout() { return reconnectionTimeout; } @@ -256,14 +264,15 @@ class BaseConfig> { * Redis server will be excluded from the internal list of available nodes * when sequential unsuccessful execution attempts of any Redis command * on this server reaches failedAttempts. - * + *

* Default is 3 * */ public T setFailedAttempts(int slaveFailedAttempts) { this.failedAttempts = slaveFailedAttempts; - return (T)this; + return (T) this; } + public int getFailedAttempts() { return failedAttempts; } diff --git a/src/main/java/org/redisson/Config.java b/src/main/java/org/redisson/Config.java index 5c8d7e98c..28e697915 100644 --- a/src/main/java/org/redisson/Config.java +++ b/src/main/java/org/redisson/Config.java @@ -79,10 +79,10 @@ public class Config { if (oldConf.getMasterSlaveServersConfig() != null) { setMasterSlaveServersConfig(new MasterSlaveServersConfig(oldConf.getMasterSlaveServersConfig())); } - if (oldConf.getSentinelServersConfig() != null ) { + if (oldConf.getSentinelServersConfig() != null) { setSentinelServersConfig(new SentinelServersConfig(oldConf.getSentinelServersConfig())); } - if (oldConf.getClusterServersConfig() != null ) { + if (oldConf.getClusterServersConfig() != null) { setClusterServersConfig(new ClusterServersConfig(oldConf.getClusterServersConfig())); } if (oldConf.getElasticacheServersConfig() != null) { @@ -100,6 +100,7 @@ public class Config { this.codec = codec; return this; } + public Codec getCodec() { return codec; } @@ -131,10 +132,10 @@ public class Config { return clusterServersConfig; } - ClusterServersConfig getClusterServersConfig() { return clusterServersConfig; } + void setClusterServersConfig(ClusterServersConfig clusterServersConfig) { this.clusterServersConfig = clusterServersConfig; } @@ -169,6 +170,7 @@ public class Config { ElasticacheServersConfig getElasticacheServersConfig() { return elasticacheServersConfig; } + void setElasticacheServersConfig(ElasticacheServersConfig elasticacheServersConfig) { this.elasticacheServersConfig = elasticacheServersConfig; } @@ -200,10 +202,10 @@ public class Config { return singleServerConfig; } - SingleServerConfig getSingleServerConfig() { return singleServerConfig; } + void setSingleServerConfig(SingleServerConfig singleConnectionConfig) { this.singleServerConfig = singleConnectionConfig; } @@ -237,6 +239,7 @@ public class Config { SentinelServersConfig getSentinelServersConfig() { return sentinelServersConfig; } + void setSentinelServersConfig(SentinelServersConfig sentinelConnectionConfig) { this.sentinelServersConfig = sentinelConnectionConfig; } @@ -270,6 +273,7 @@ public class Config { MasterSlaveServersConfig getMasterSlaveServersConfig() { return masterSlaveServersConfig; } + void setMasterSlaveServersConfig(MasterSlaveServersConfig masterSlaveConnectionConfig) { this.masterSlaveServersConfig = masterSlaveConnectionConfig; } @@ -339,6 +343,7 @@ public class Config { this.useLinuxNativeEpoll = useLinuxNativeEpoll; return this; } + public boolean isUseLinuxNativeEpoll() { return useLinuxNativeEpoll; } @@ -360,6 +365,7 @@ public class Config { this.eventLoopGroup = eventLoopGroup; return this; } + public EventLoopGroup getEventLoopGroup() { return eventLoopGroup; } diff --git a/src/main/java/org/redisson/client/handler/CommandEncoder.java b/src/main/java/org/redisson/client/handler/CommandEncoder.java index dacbe6911..8c7560908 100644 --- a/src/main/java/org/redisson/client/handler/CommandEncoder.java +++ b/src/main/java/org/redisson/client/handler/CommandEncoder.java @@ -66,9 +66,11 @@ public class CommandEncoder extends MessageToByteEncoder>> (16 + 3); r = i - ((q << 3) + (q << 1)); // r = i-(q*10) ... - buf[--charPos] = (byte) digits[(int)r]; + buf[--charPos] = (byte) DIGITS[(int) r]; i = q; if (i == 0) break; @@ -194,5 +192,4 @@ public class CommandEncoder extends MessageToByteEncoder mapTyper = new DefaultTypeResolverBuilder(DefaultTyping.NON_FINAL) { - public boolean useForType(JavaType t) - { + public boolean useForType(JavaType t) { switch (_appliesFor) { case NON_CONCRETE_AND_ARRAYS: while (t.isArrayType()) { @@ -93,7 +92,7 @@ public class JsonJacksonCodec implements Codec { } return !t.isFinal(); // includes Object.class default: - //case JAVA_LANG_OBJECT: + // case JAVA_LANG_OBJECT: return (t.getRawClass() == Object.class); } } @@ -106,10 +105,9 @@ public class JsonJacksonCodec implements Codec { protected void init(ObjectMapper objectMapper) { objectMapper.setSerializationInclusion(Include.NON_NULL); objectMapper.setVisibilityChecker(objectMapper.getSerializationConfig().getDefaultVisibilityChecker() - .withFieldVisibility(JsonAutoDetect.Visibility.ANY) - .withGetterVisibility(JsonAutoDetect.Visibility.NONE) - .withSetterVisibility(JsonAutoDetect.Visibility.NONE) - .withCreatorVisibility(JsonAutoDetect.Visibility.NONE)); + .withFieldVisibility(JsonAutoDetect.Visibility.ANY).withGetterVisibility(JsonAutoDetect.Visibility.NONE) + .withSetterVisibility(JsonAutoDetect.Visibility.NONE) + .withCreatorVisibility(JsonAutoDetect.Visibility.NONE)); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); objectMapper.configure(SerializationFeature.WRITE_BIGDECIMAL_AS_PLAIN, true); objectMapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true);