This is an automated email from the ASF dual-hosted git repository. srdo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push: new 3c2e03e STORM-3444: redis: fix all checkstyle warnings new 8950d9b Merge pull request #3059 from krichter722/checkstyle-redis 3c2e03e is described below commit 3c2e03ecfd1657ab99ceea9226f31667f8fd32e8 Author: Karl-Philipp Richter <krich...@posteo.de> AuthorDate: Mon Jul 1 20:18:09 2019 +0200 STORM-3444: redis: fix all checkstyle warnings --- external/storm-redis/pom.xml | 2 +- .../apache/storm/redis/bolt/AbstractRedisBolt.java | 12 ++++----- .../apache/storm/redis/bolt/RedisFilterBolt.java | 20 +++++++-------- .../apache/storm/redis/bolt/RedisLookupBolt.java | 8 +++--- .../apache/storm/redis/bolt/RedisStoreBolt.java | 10 ++++---- .../common/adapter/RedisCommandsAdapterJedis.java | 30 +++++++++++----------- .../adapter/RedisCommandsAdapterJedisCluster.java | 30 +++++++++++----------- .../storm/redis/common/commands/RedisCommands.java | 4 +-- .../storm/redis/common/config/JedisPoolConfig.java | 14 +++++----- .../common/container/JedisClusterContainer.java | 2 +- .../container/JedisCommandsInstanceContainer.java | 2 +- .../redis/common/container/JedisContainer.java | 2 +- .../common/container/RedisClusterContainer.java | 2 +- .../redis/common/container/RedisContainer.java | 2 +- .../common/mapper/RedisDataTypeDescription.java | 12 +++++---- .../storm/redis/state/RedisKeyValueState.java | 4 +-- .../redis/state/RedisKeyValueStateProvider.java | 18 ++++++------- .../trident/state/AbstractRedisStateQuerier.java | 2 +- .../trident/state/AbstractRedisStateUpdater.java | 8 +++--- .../storm/redis/trident/state/KeyFactory.java | 2 +- .../redis/trident/state/RedisClusterMapState.java | 4 +-- .../redis/trident/state/RedisClusterState.java | 12 ++++----- .../trident/state/RedisClusterStateQuerier.java | 2 +- .../trident/state/RedisClusterStateUpdater.java | 6 ++--- .../storm/redis/trident/state/RedisMapState.java | 4 +-- .../storm/redis/trident/state/RedisState.java | 8 +++--- .../redis/trident/state/RedisStateQuerier.java | 2 +- .../redis/trident/state/RedisStateUpdater.java | 6 ++--- 28 files changed, 116 insertions(+), 114 deletions(-) diff --git a/external/storm-redis/pom.xml b/external/storm-redis/pom.xml index 5c90279..1938d46 100644 --- a/external/storm-redis/pom.xml +++ b/external/storm-redis/pom.xml @@ -86,7 +86,7 @@ <artifactId>maven-checkstyle-plugin</artifactId> <!--Note - the version would be inherited--> <configuration> - <maxAllowedViolations>64</maxAllowedViolations> + <maxAllowedViolations>0</maxAllowedViolations> </configuration> </plugin> <plugin> diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/AbstractRedisBolt.java b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/AbstractRedisBolt.java index 06d59b6..fd49f91 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/AbstractRedisBolt.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/AbstractRedisBolt.java @@ -24,12 +24,12 @@ import redis.clients.jedis.JedisCommands; /** * AbstractRedisBolt class is for users to implement custom bolts which makes interaction with Redis. - * <p/> - * Due to environment abstraction, AbstractRedisBolt provides JedisCommands which contains only single key operations. - * <p/> - * Custom Bolts may want to follow this pattern: - * <p/> - * <blockquote><pre> + * + * <p>Due to environment abstraction, AbstractRedisBolt provides JedisCommands which contains only single key operations. + * + * <p>Custom Bolts may want to follow this pattern: + * + * <p><blockquote><pre> * JedisCommands jedisCommands = null; * try { * jedisCommand = getInstance(); diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisFilterBolt.java b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisFilterBolt.java index 1b7ab20..a3f0ace 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisFilterBolt.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisFilterBolt.java @@ -25,16 +25,16 @@ import redis.clients.jedis.JedisCommands; /** * Basic bolt for querying from Redis and filters out if key/field doesn't exist. * If key/field exists on Redis, this bolt just forwards input tuple to default stream. - * <p/> - * Supported data types: STRING, HASH, SET, SORTED_SET, HYPER_LOG_LOG, GEO. - * <p/> - * Note: For STRING it checks such key exists on the key space. + * + * <p>Supported data types: STRING, HASH, SET, SORTED_SET, HYPER_LOG_LOG, GEO. + * + * <p>Note: For STRING it checks such key exists on the key space. * For HASH and SORTED_SET and GEO, it checks such field exists on that data structure. * For SET and HYPER_LOG_LOG, it check such value exists on that data structure. * (Note that it still refers key from tuple via RedisFilterMapper#getKeyFromTuple()) * In order to apply checking this to SET, you need to input additional key this case. - * <p/> - * Note2: If you want to just query about existence of key regardless of actual data type, + * + * <p>Note2: If you want to just query about existence of key regardless of actual data type, * specify STRING to data type of RedisFilterMapper. */ public class RedisFilterBolt extends AbstractRedisBolt { @@ -43,7 +43,7 @@ public class RedisFilterBolt extends AbstractRedisBolt { private final String additionalKey; /** - * Constructor for single Redis environment (JedisPool) + * Constructor for single Redis environment (JedisPool). * @param config configuration for initializing JedisPool * @param filterMapper mapper containing which datatype, query key that Bolt uses */ @@ -56,14 +56,14 @@ public class RedisFilterBolt extends AbstractRedisBolt { this.dataType = dataTypeDescription.getDataType(); this.additionalKey = dataTypeDescription.getAdditionalKey(); - if (dataType == RedisDataTypeDescription.RedisDataType.SET && - additionalKey == null) { + if (dataType == RedisDataTypeDescription.RedisDataType.SET + && additionalKey == null) { throw new IllegalArgumentException("additionalKey should be defined"); } } /** - * Constructor for Redis Cluster environment (JedisCluster) + * Constructor for Redis Cluster environment (JedisCluster). * @param config configuration for initializing JedisCluster * @param filterMapper mapper containing which datatype, query key that Bolt uses */ diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisLookupBolt.java b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisLookupBolt.java index 5311d85..4d90340 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisLookupBolt.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisLookupBolt.java @@ -24,8 +24,8 @@ import redis.clients.jedis.JedisCommands; /** * Basic bolt for querying from Redis and emits response as tuple. - * <p/> - * Various data types are supported: STRING, LIST, HASH, SET, SORTED_SET, HYPER_LOG_LOG, GEO + * + * <p>Various data types are supported: STRING, LIST, HASH, SET, SORTED_SET, HYPER_LOG_LOG, GEO */ public class RedisLookupBolt extends AbstractRedisBolt { private final RedisLookupMapper lookupMapper; @@ -33,7 +33,7 @@ public class RedisLookupBolt extends AbstractRedisBolt { private final String additionalKey; /** - * Constructor for single Redis environment (JedisPool) + * Constructor for single Redis environment (JedisPool). * @param config configuration for initializing JedisPool * @param lookupMapper mapper containing which datatype, query key, output key that Bolt uses */ @@ -48,7 +48,7 @@ public class RedisLookupBolt extends AbstractRedisBolt { } /** - * Constructor for Redis Cluster environment (JedisCluster) + * Constructor for Redis Cluster environment (JedisCluster). * @param config configuration for initializing JedisCluster * @param lookupMapper mapper containing which datatype, query key, output key that Bolt uses */ diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisStoreBolt.java b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisStoreBolt.java index 8ca74e9..ce08a73 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisStoreBolt.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/bolt/RedisStoreBolt.java @@ -21,9 +21,9 @@ import org.apache.storm.tuple.Tuple; import redis.clients.jedis.JedisCommands; /** - * Basic bolt for writing to Redis - * <p/> - * Various data types are supported: STRING, LIST, HASH, SET, SORTED_SET, HYPER_LOG_LOG, GEO + * Basic bolt for writing to Redis. + * + * <p>Various data types are supported: STRING, LIST, HASH, SET, SORTED_SET, HYPER_LOG_LOG, GEO */ public class RedisStoreBolt extends AbstractRedisBolt { private final RedisStoreMapper storeMapper; @@ -31,7 +31,7 @@ public class RedisStoreBolt extends AbstractRedisBolt { private final String additionalKey; /** - * Constructor for single Redis environment (JedisPool) + * Constructor for single Redis environment (JedisPool). * @param config configuration for initializing JedisPool * @param storeMapper mapper containing which datatype, storing value's key that Bolt uses */ @@ -45,7 +45,7 @@ public class RedisStoreBolt extends AbstractRedisBolt { } /** - * Constructor for Redis Cluster environment (JedisCluster) + * Constructor for Redis Cluster environment (JedisCluster). * @param config configuration for initializing JedisCluster * @param storeMapper mapper containing which datatype, storing value's key that Bolt uses */ diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/adapter/RedisCommandsAdapterJedis.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/adapter/RedisCommandsAdapterJedis.java index 89d759d..d791bd8 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/adapter/RedisCommandsAdapterJedis.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/adapter/RedisCommandsAdapterJedis.java @@ -47,16 +47,31 @@ public class RedisCommandsAdapterJedis implements RedisCommands, Closeable { } @Override + public boolean exists(String key) { + return jedis.exists(key); + } + + @Override public String hmset(byte[] key, Map<byte[], byte[]> fieldValues) { return jedis.hmset(key, fieldValues); } @Override + public String hmset(String key, Map<String, String> fieldValues) { + return jedis.hmset(key, fieldValues); + } + + @Override public Map<byte[], byte[]> hgetAll(byte[] key) { return jedis.hgetAll(key); } @Override + public Map<String, String> hgetAll(String key) { + return jedis.hgetAll(key); + } + + @Override public Long hdel(byte[] key, byte[]... fields) { return jedis.hdel(key, fields); } @@ -87,21 +102,6 @@ public class RedisCommandsAdapterJedis implements RedisCommands, Closeable { } @Override - public boolean exists(String key) { - return jedis.exists(key); - } - - @Override - public Map<String, String> hgetAll(String key) { - return jedis.hgetAll(key); - } - - @Override - public String hmset(String key, Map<String, String> fieldValues) { - return jedis.hmset(key, fieldValues); - } - - @Override public void close() throws IOException { jedis.close(); } diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/adapter/RedisCommandsAdapterJedisCluster.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/adapter/RedisCommandsAdapterJedisCluster.java index 680b3c9..15f5e0a 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/adapter/RedisCommandsAdapterJedisCluster.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/adapter/RedisCommandsAdapterJedisCluster.java @@ -47,16 +47,31 @@ public class RedisCommandsAdapterJedisCluster implements RedisCommands, Closeabl } @Override + public boolean exists(String key) { + return jedisCluster.exists(key); + } + + @Override public String hmset(byte[] key, Map<byte[], byte[]> fieldValues) { return jedisCluster.hmset(key, fieldValues); } @Override + public String hmset(String key, Map<String, String> fieldValues) { + return jedisCluster.hmset(key, fieldValues); + } + + @Override public Map<byte[], byte[]> hgetAll(byte[] key) { return jedisCluster.hgetAll(key); } @Override + public Map<String, String> hgetAll(String key) { + return jedisCluster.hgetAll(key); + } + + @Override public Long hdel(byte[] key, byte[]... fields) { return jedisCluster.hdel(key, fields); } @@ -87,21 +102,6 @@ public class RedisCommandsAdapterJedisCluster implements RedisCommands, Closeabl } @Override - public boolean exists(String key) { - return jedisCluster.exists(key); - } - - @Override - public Map<String, String> hgetAll(String key) { - return jedisCluster.hgetAll(key); - } - - @Override - public String hmset(String key, Map<String, String> fieldValues) { - return jedisCluster.hmset(key, fieldValues); - } - - @Override public void close() throws IOException { jedisCluster.close(); } diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/commands/RedisCommands.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/commands/RedisCommands.java index 172d2ab..58835b1 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/commands/RedisCommands.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/commands/RedisCommands.java @@ -25,8 +25,8 @@ import redis.clients.jedis.ScanResult; /** * This interface represents Jedis methods exhaustively which are used on storm-redis. * - * This is a workaround since Jedis and JedisCluster doesn't implement same interface for binary type of methods, and unify binary methods - * and string methods into one interface. + * <p>This is a workaround since Jedis and JedisCluster doesn't implement same interface for binary type of methods, and + * unify binary methods and string methods into one interface. */ public interface RedisCommands { // common diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/config/JedisPoolConfig.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/config/JedisPoolConfig.java index f1025c9..3e53cac 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/config/JedisPoolConfig.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/config/JedisPoolConfig.java @@ -91,13 +91,13 @@ public class JedisPoolConfig implements Serializable { @Override public String toString() { - return "JedisPoolConfig{" + - "host='" + host + '\'' + - ", port=" + port + - ", timeout=" + timeout + - ", database=" + database + - ", password='" + password + '\'' + - '}'; + return "JedisPoolConfig{" + + "host='" + host + '\'' + + ", port=" + port + + ", timeout=" + timeout + + ", database=" + database + + ", password='" + password + '\'' + + '}'; } /** diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisClusterContainer.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisClusterContainer.java index 9f1cb78..ca2a2f4 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisClusterContainer.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisClusterContainer.java @@ -26,7 +26,7 @@ public class JedisClusterContainer implements JedisCommandsInstanceContainer { private JedisCluster jedisCluster; /** - * Constructor + * Constructor. * @param jedisCluster JedisCluster instance */ public JedisClusterContainer(JedisCluster jedisCluster) { diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisCommandsInstanceContainer.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisCommandsInstanceContainer.java index 8ca0716..82b56cf 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisCommandsInstanceContainer.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisCommandsInstanceContainer.java @@ -32,7 +32,7 @@ public interface JedisCommandsInstanceContainer extends Closeable { void returnInstance(JedisCommands jedisCommands); /** - * Release Container + * Release Container. */ @Override public void close(); diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java index aa78480..1ebb550 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/JedisContainer.java @@ -28,7 +28,7 @@ public class JedisContainer implements JedisCommandsInstanceContainer { private JedisPool jedisPool; /** - * Constructor + * Constructor. * @param jedisPool JedisPool which actually manages Jedis instances */ public JedisContainer(JedisPool jedisPool) { diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisClusterContainer.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisClusterContainer.java index 512e950..04c05b8 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisClusterContainer.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisClusterContainer.java @@ -32,7 +32,7 @@ public class RedisClusterContainer implements RedisCommandsInstanceContainer { private JedisCluster jedisCluster; /** - * Constructor + * Constructor. * * @param jedisCluster JedisCluster instance */ diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisContainer.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisContainer.java index 1753bb8..a64edf2 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisContainer.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/container/RedisContainer.java @@ -32,7 +32,7 @@ public class RedisContainer implements RedisCommandsInstanceContainer { private JedisPool jedisPool; /** - * Constructor + * Constructor. * * @param jedisPool JedisPool which actually manages Jedis instances */ diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/common/mapper/RedisDataTypeDescription.java b/external/storm-redis/src/main/java/org/apache/storm/redis/common/mapper/RedisDataTypeDescription.java index e3eac77..b896bdb 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/common/mapper/RedisDataTypeDescription.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/common/mapper/RedisDataTypeDescription.java @@ -20,8 +20,9 @@ import java.io.Serializable; public class RedisDataTypeDescription implements Serializable { private RedisDataType dataType; private String additionalKey; + /** - * Constructor + * Constructor. * @param dataType data type */ public RedisDataTypeDescription(RedisDataType dataType) { @@ -29,7 +30,7 @@ public class RedisDataTypeDescription implements Serializable { } /** - * Constructor + * Constructor. * @param dataType data type * @param additionalKey additional key for hash and sorted set */ @@ -37,8 +38,9 @@ public class RedisDataTypeDescription implements Serializable { this.dataType = dataType; this.additionalKey = additionalKey; - if (dataType == RedisDataType.HASH || - dataType == RedisDataType.SORTED_SET || dataType == RedisDataType.GEO) { + if (dataType == RedisDataType.HASH + || dataType == RedisDataType.SORTED_SET + || dataType == RedisDataType.GEO) { if (additionalKey == null) { throw new IllegalArgumentException("Hash, Sorted Set and GEO should have additional key"); } @@ -61,5 +63,5 @@ public class RedisDataTypeDescription implements Serializable { return additionalKey; } - public enum RedisDataType {STRING, HASH, LIST, SET, SORTED_SET, HYPER_LOG_LOG, GEO} + public enum RedisDataType { STRING, HASH, LIST, SET, SORTED_SET, HYPER_LOG_LOG, GEO } } diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java index 95d0511..2a11d96 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java @@ -299,8 +299,8 @@ public class RedisKeyValueState<K, V> implements KeyValueState<K, V> { Long committedTxid = lastCommittedTxid(); if (committedTxid != null) { if (txid <= committedTxid) { - throw new RuntimeException("Invalid txid '" + txid + "' for prepare. Txid '" + committedTxid + - "' is already committed"); + throw new RuntimeException("Invalid txid '" + txid + "' for prepare. Txid '" + committedTxid + + "' is already committed"); } } } diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueStateProvider.java b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueStateProvider.java index 28201bc..26518d4 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueStateProvider.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueStateProvider.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Provides {@link RedisKeyValueState} + * Provides {@link RedisKeyValueState}. */ public class RedisKeyValueStateProvider implements StateProvider { private static final Logger LOG = LoggerFactory.getLogger(RedisKeyValueStateProvider.class); @@ -124,14 +124,14 @@ public class RedisKeyValueStateProvider implements StateProvider { @Override public String toString() { - return "StateConfig{" + - "keyClass='" + keyClass + '\'' + - ", valueClass='" + valueClass + '\'' + - ", keySerializerClass='" + keySerializerClass + '\'' + - ", valueSerializerClass='" + valueSerializerClass + '\'' + - ", jedisPoolConfig=" + jedisPoolConfig + - ", jedisClusterConfig=" + jedisClusterConfig + - '}'; + return "StateConfig{" + + "keyClass='" + keyClass + '\'' + + ", valueClass='" + valueClass + '\'' + + ", keySerializerClass='" + keySerializerClass + '\'' + + ", valueSerializerClass='" + valueSerializerClass + '\'' + + ", jedisPoolConfig=" + jedisPoolConfig + + ", jedisClusterConfig=" + jedisClusterConfig + + '}'; } } diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/AbstractRedisStateQuerier.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/AbstractRedisStateQuerier.java index 0005989..4378f8f 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/AbstractRedisStateQuerier.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/AbstractRedisStateQuerier.java @@ -36,7 +36,7 @@ public abstract class AbstractRedisStateQuerier<T extends State> extends BaseQue private final RedisLookupMapper lookupMapper; /** - * Constructor + * Constructor. * * @param lookupMapper mapper for querying */ diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/AbstractRedisStateUpdater.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/AbstractRedisStateUpdater.java index 84a32f7..5663e18 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/AbstractRedisStateUpdater.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/AbstractRedisStateUpdater.java @@ -24,8 +24,8 @@ import org.apache.storm.trident.tuple.TridentTuple; /** * AbstractRedisStateUpdater is base class of any RedisStateUpdater, which implements BaseStateUpdater. - * <p/> - * Derived classes should provide how to update (key, value) pairs to Redis, + * + * <p>Derived classes should provide how to update (key, value) pairs to Redis, * and AbstractRedisStateUpdater takes care of rest things. * * @param <T> type of State @@ -37,7 +37,7 @@ public abstract class AbstractRedisStateUpdater<T extends State> extends BaseSta protected int expireIntervalSec = 0; /** - * Constructor + * Constructor. * * @param storeMapper mapper for storing */ @@ -49,7 +49,7 @@ public abstract class AbstractRedisStateUpdater<T extends State> extends BaseSta } /** - * Sets expire (time to live) if needed + * Sets expire (time to live) if needed. * * @param expireIntervalSec time to live in seconds */ diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/KeyFactory.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/KeyFactory.java index cc8c06a..88243c9 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/KeyFactory.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/KeyFactory.java @@ -27,7 +27,7 @@ public interface KeyFactory extends Serializable { String build(List<Object> key); /** - * Default Key Factory + * Default Key Factory. */ class DefaultKeyFactory implements KeyFactory { /** diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java index c43a18d..dddee15 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterMapState.java @@ -46,7 +46,7 @@ public class RedisClusterMapState<T> extends AbstractRedisMapState<T> { private KeyFactory keyFactory; /** - * Constructor + * Constructor. * * @param jedisCluster JedisCluster * @param options options of State @@ -287,7 +287,7 @@ public class RedisClusterMapState<T> extends AbstractRedisMapState<T> { Options options; /** - * Constructor + * Constructor. * * @param jedisClusterConfig configuration for JedisCluster * @param type StateType diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java index 7bdd86b..c7f0189 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterState.java @@ -26,7 +26,7 @@ public class RedisClusterState implements State { private JedisCluster jedisCluster; /** - * Constructor + * Constructor. * * @param jedisCluster JedisCluster */ @@ -38,20 +38,20 @@ public class RedisClusterState implements State { * {@inheritDoc} */ @Override - public void beginCommit(Long aLong) { + public void beginCommit(Long someLong) { } /** * {@inheritDoc} */ @Override - public void commit(Long aLong) { + public void commit(Long someLong) { } /** * Borrows JedisCluster instance. - * <p/> - * Note that you should return borrowed instance when you finish using instance. + * + * <p>Note that you should return borrowed instance when you finish using instance. * * @return JedisCluster instance */ @@ -79,7 +79,7 @@ public class RedisClusterState implements State { private JedisClusterConfig jedisClusterConfig; /** - * Constructor + * Constructor. * * @param config configuration of JedisCluster */ diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateQuerier.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateQuerier.java index b7401aa..88f61a1 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateQuerier.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateQuerier.java @@ -24,7 +24,7 @@ import redis.clients.jedis.JedisCluster; */ public class RedisClusterStateQuerier extends AbstractRedisStateQuerier<RedisClusterState> { /** - * Constructor + * Constructor. * * @param lookupMapper mapper for querying */ diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateUpdater.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateUpdater.java index 0258ae5..bdcd66b 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateUpdater.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisClusterStateUpdater.java @@ -24,7 +24,7 @@ import redis.clients.jedis.JedisCluster; */ public class RedisClusterStateUpdater extends AbstractRedisStateUpdater<RedisClusterState> { /** - * Constructor + * Constructor. * * @param storeMapper mapper for storing */ @@ -74,8 +74,8 @@ public class RedisClusterStateUpdater extends AbstractRedisStateUpdater<RedisClu // send expire command for hash only once // it expires key itself entirely, so use it with caution - if (dataType == RedisDataTypeDescription.RedisDataType.HASH && - this.expireIntervalSec > 0) { + if (dataType == RedisDataTypeDescription.RedisDataType.HASH + && this.expireIntervalSec > 0) { jedisCluster.expire(additionalKey, expireIntervalSec); } } finally { diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java index 6febc41..55e95ec 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisMapState.java @@ -47,7 +47,7 @@ public class RedisMapState<T> extends AbstractRedisMapState<T> { private KeyFactory keyFactory; /** - * Constructor + * Constructor. * * @param jedisPool JedisPool * @param options options of State @@ -317,7 +317,7 @@ public class RedisMapState<T> extends AbstractRedisMapState<T> { Options options; /** - * Constructor + * Constructor. * * @param jedisPoolConfig configuration for JedisPool * @param type StateType diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java index 76b60f7..88089d9 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisState.java @@ -27,7 +27,7 @@ public class RedisState implements State { private JedisPool jedisPool; /** - * Constructor + * Constructor. * * @param jedisPool JedisPool */ @@ -39,14 +39,14 @@ public class RedisState implements State { * {@inheritDoc} */ @Override - public void beginCommit(Long aLong) { + public void beginCommit(Long someLong) { } /** * {@inheritDoc} */ @Override - public void commit(Long aLong) { + public void commit(Long someLong) { } /** @@ -80,7 +80,7 @@ public class RedisState implements State { private JedisPoolConfig jedisPoolConfig; /** - * Constructor + * Constructor. * * @param config configuration of JedisPool */ diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateQuerier.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateQuerier.java index 8be00e2..eea76c3 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateQuerier.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateQuerier.java @@ -23,7 +23,7 @@ import redis.clients.jedis.Jedis; */ public class RedisStateQuerier extends AbstractRedisStateQuerier<RedisState> { /** - * Constructor + * Constructor. * * @param lookupMapper mapper for querying */ diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateUpdater.java b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateUpdater.java index 0a5aede..8984468 100644 --- a/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateUpdater.java +++ b/external/storm-redis/src/main/java/org/apache/storm/redis/trident/state/RedisStateUpdater.java @@ -25,7 +25,7 @@ import redis.clients.jedis.Pipeline; */ public class RedisStateUpdater extends AbstractRedisStateUpdater<RedisState> { /** - * Constructor + * Constructor. * * @param storeMapper mapper for storing */ @@ -76,8 +76,8 @@ public class RedisStateUpdater extends AbstractRedisStateUpdater<RedisState> { // send expire command for hash only once // it expires key itself entirely, so use it with caution - if (dataType == RedisDataTypeDescription.RedisDataType.HASH && - this.expireIntervalSec > 0) { + if (dataType == RedisDataTypeDescription.RedisDataType.HASH + && this.expireIntervalSec > 0) { pipeline.expire(additionalKey, expireIntervalSec); }