You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2019/07/06 15:53:47 UTC
[storm] branch master updated: STORM-3456: cassandra: fix all
checkstyle warnings
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 4f53227 STORM-3456: cassandra: fix all checkstyle warnings
new 8cd3a53 Merge pull request #3074 from krichter722/checkstyle-cassandra
4f53227 is described below
commit 4f532273f9d63ac560561d13be31d5242d4d82b4
Author: Karl-Philipp Richter <kr...@posteo.de>
AuthorDate: Thu Jul 4 22:13:23 2019 +0200
STORM-3456: cassandra: fix all checkstyle warnings
---
external/storm-cassandra/pom.xml | 2 +-
.../cassandra/AbstractExecutionResultHandler.java | 4 ++-
.../cassandra/BaseExecutionResultHandler.java | 3 ++-
.../apache/storm/cassandra/CassandraContext.java | 3 ---
.../storm/cassandra/DynamicStatementBuilder.java | 6 +++--
.../storm/cassandra/Murmur3StreamGrouping.java | 8 +++---
.../storm/cassandra/bolt/BaseCassandraBolt.java | 27 +++++++++----------
.../cassandra/bolt/BatchCassandraWriterBolt.java | 15 +++++------
.../storm/cassandra/bolt/CassandraWriterBolt.java | 2 --
.../storm/cassandra/bolt/GroupingBatchBuilder.java | 4 ---
.../storm/cassandra/bolt/PairStatementTuple.java | 2 --
.../storm/cassandra/client/CassandraConf.java | 2 +-
.../storm/cassandra/client/impl/DefaultClient.java | 5 ++--
.../storm/cassandra/context/BaseBeanFactory.java | 4 ++-
.../storm/cassandra/context/BeanFactory.java | 2 --
.../apache/storm/cassandra/context/WorkerCtx.java | 12 +++++----
.../storm/cassandra/executor/AsyncExecutor.java | 21 ++++++++-------
.../executor/ExecutionResultCollector.java | 8 ++++--
.../executor/impl/BatchAsyncResultHandler.java | 6 ++---
.../executor/impl/SingleAsyncResultHandler.java | 6 ++---
.../query/AyncCQLResultSetValuesMapper.java | 3 ++-
.../query/BaseCQLStatementTupleMapper.java | 2 +-
.../cassandra/query/CQLResultSetValuesMapper.java | 4 +--
.../storm/cassandra/query/CQLStatementBuilder.java | 2 +-
.../cassandra/query/CQLStatementTupleMapper.java | 2 ++
.../org/apache/storm/cassandra/query/Column.java | 26 +++++++++++-------
.../apache/storm/cassandra/query/ContextQuery.java | 10 ++++---
.../apache/storm/cassandra/query/CqlMapper.java | 6 +++--
.../builder/BoundCQLStatementMapperBuilder.java | 7 +++--
.../builder/SimpleCQLStatementMapperBuilder.java | 11 ++++----
.../query/impl/BatchCQLStatementTupleMapper.java | 7 +++--
.../query/impl/BoundCQLStatementTupleMapper.java | 7 +----
.../query/impl/ObjectMapperCqlStatementMapper.java | 5 ++--
.../query/impl/PreparedStatementBinder.java | 4 +--
.../cassandra/query/impl/RoutingKeyGenerator.java | 1 -
.../query/impl/SimpleCQLStatementMapper.java | 4 +--
.../cassandra/query/selector/FieldSelector.java | 12 ++++-----
.../trident/state/CassandraBackingMap.java | 13 ++++-----
.../trident/state/CassandraMapStateFactory.java | 3 +--
.../cassandra/trident/state/CassandraQuery.java | 3 ---
.../cassandra/trident/state/CassandraState.java | 5 ++--
.../trident/state/CassandraStateFactory.java | 3 ---
.../trident/state/CassandraStateUpdater.java | 3 ---
.../trident/state/MapStateFactoryBuilder.java | 31 +++++++++++-----------
.../trident/state/OpaqueTupleStateMapper.java | 1 +
.../state/TransactionalTupleStateMapper.java | 1 +
.../state/TridentAyncCQLResultSetValuesMapper.java | 1 +
.../state/TridentResultSetValuesMapper.java | 3 ---
48 files changed, 154 insertions(+), 168 deletions(-)
diff --git a/external/storm-cassandra/pom.xml b/external/storm-cassandra/pom.xml
index f670a6e..495f9d5 100644
--- a/external/storm-cassandra/pom.xml
+++ b/external/storm-cassandra/pom.xml
@@ -132,7 +132,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<!--Note - the version would be inherited-->
<configuration>
- <maxAllowedViolations>159</maxAllowedViolations>
+ <maxAllowedViolations>0</maxAllowedViolations>
</configuration>
</plugin>
<plugin>
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/AbstractExecutionResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/AbstractExecutionResultHandler.java
index 3b32749..bb397b7 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/AbstractExecutionResultHandler.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/AbstractExecutionResultHandler.java
@@ -48,6 +48,8 @@ public abstract class AbstractExecutionResultHandler implements ExecutionResultH
@Override
public void onThrowable(Throwable t, OutputCollector collector, List<Tuple> tl) {
- for (Tuple i : tl) onThrowable(t, collector, i);
+ for (Tuple i : tl) {
+ onThrowable(t, collector, i);
+ }
}
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/BaseExecutionResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/BaseExecutionResultHandler.java
index 57ef351..e8f3259 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/BaseExecutionResultHandler.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/BaseExecutionResultHandler.java
@@ -19,6 +19,7 @@ import com.datastax.driver.core.exceptions.UnavailableException;
import com.datastax.driver.core.exceptions.WriteTimeoutException;
import org.apache.storm.task.OutputCollector;
import org.apache.storm.tuple.Tuple;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
@@ -29,7 +30,7 @@ import org.slf4j.LoggerFactory;
*/
public class BaseExecutionResultHandler extends AbstractExecutionResultHandler {
- private final static org.slf4j.Logger LOG = LoggerFactory.getLogger(BaseExecutionResultHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BaseExecutionResultHandler.class);
/**
* {@inheritDoc}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/CassandraContext.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/CassandraContext.java
index 49763d2..5c43852 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/CassandraContext.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/CassandraContext.java
@@ -24,9 +24,6 @@ import org.apache.storm.cassandra.context.WorkerCtx;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- */
public class CassandraContext extends WorkerCtx implements SimpleClientProvider {
/**
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/DynamicStatementBuilder.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/DynamicStatementBuilder.java
index 823a566..f085f2b 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/DynamicStatementBuilder.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/DynamicStatementBuilder.java
@@ -93,8 +93,9 @@ public class DynamicStatementBuilder implements Serializable {
private static BatchCQLStatementTupleMapper newBatchStatementBuilder(BatchStatement.Type type, CQLStatementBuilder[] builders) {
List<CQLStatementTupleMapper> mappers = new ArrayList<>(builders.length);
- for (CQLStatementBuilder b : Arrays.asList(builders))
+ for (CQLStatementBuilder b : Arrays.asList(builders)) {
mappers.add(b.build());
+ }
return new BatchCQLStatementTupleMapper(type, mappers);
}
@@ -136,8 +137,9 @@ public class DynamicStatementBuilder implements Serializable {
public static final FieldSelector[] fields(final String... fields) {
int size = fields.length;
List<FieldSelector> fl = new ArrayList<>(size);
- for (int i = 0; i < size; i++)
+ for (int i = 0; i < size; i++) {
fl.add(new FieldSelector(fields[i]));
+ }
return fl.toArray(new FieldSelector[size]);
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/Murmur3StreamGrouping.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/Murmur3StreamGrouping.java
index c172cb6..593e654 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/Murmur3StreamGrouping.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/Murmur3StreamGrouping.java
@@ -28,10 +28,9 @@ import org.apache.storm.topology.FailedException;
import org.apache.storm.tuple.Fields;
/**
- *
* Simple {@link org.apache.storm.grouping.CustomStreamGrouping} that uses Murmur3 algorithm to choose the target task of a tuple.
*
- * This stream grouping may be used to optimise writes to Apache Cassandra.
+ * <p>This stream grouping may be used to optimise writes to Apache Cassandra.
*/
public class Murmur3StreamGrouping implements CustomStreamGrouping {
@@ -66,9 +65,8 @@ public class Murmur3StreamGrouping implements CustomStreamGrouping {
* http://stackoverflow.com/questions/27212797/cassandra-hashing-algorithm-with-composite-keys
* https://github.com/apache/cassandra/blob/trunk/src/java/org/apache/cassandra/db/marshal/CompositeType.java
*
- * @param values the fields which are part of the (compose) partition key.
- * @return the computed hash for input values.
- * @throws java.io.IOException
+ * @param values the fields which are part of the (compose) partition key
+ * @return the computed hash for input values
*/
@VisibleForTesting
public static long hashes(List<Object> values) throws IOException {
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java
index 946932f..933bc6e 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BaseCassandraBolt.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
/**
* A base cassandra bolt.
*
- * Default {@link org.apache.storm.topology.base.BaseTickTupleAwareRichBolt}
+ * <p>Default {@link org.apache.storm.topology.base.BaseTickTupleAwareRichBolt}
*/
public abstract class BaseCassandraBolt<T> extends BaseTickTupleAwareRichBolt {
@@ -59,12 +59,11 @@ public abstract class BaseCassandraBolt<T> extends BaseTickTupleAwareRichBolt {
private CQLStatementTupleMapper mapper;
private ExecutionResultHandler resultHandler;
- transient private Map<String, Fields> outputsFields = new HashMap<>();
+ private transient Map<String, Fields> outputsFields = new HashMap<>();
private Map<String, Object> cassandraConfig;
/**
* Creates a new {@link CassandraWriterBolt} instance.
- * @param mapper
*/
public BaseCassandraBolt(CQLStatementTupleMapper mapper, SimpleClientProvider clientProvider) {
this.mapper = mapper;
@@ -73,7 +72,6 @@ public abstract class BaseCassandraBolt<T> extends BaseTickTupleAwareRichBolt {
/**
* Creates a new {@link CassandraWriterBolt} instance.
- * @param tupleMapper
*/
public BaseCassandraBolt(CQLStatementTupleMapper tupleMapper) {
this(tupleMapper, new CassandraContext());
@@ -106,7 +104,7 @@ public abstract class BaseCassandraBolt<T> extends BaseTickTupleAwareRichBolt {
}
/**
- * Configures this bolt with the given {@code fields} as outputfields with stream id as {@link Utils#DEFAULT_STREAM_ID}
+ * Configures this bolt with the given {@code fields} as outputfields with stream id as {@link Utils#DEFAULT_STREAM_ID}.
*
* @param fields outputfields
*/
@@ -118,12 +116,11 @@ public abstract class BaseCassandraBolt<T> extends BaseTickTupleAwareRichBolt {
/**
* Configures this bolt given {@code fields} as outputfields for the given {@code stream}.
- *
- * @param stream
- * @param fields
*/
public BaseCassandraBolt withStreamOutputFields(String stream, Fields fields) {
- if (stream == null || stream.length() == 0) throw new IllegalArgumentException("'stream' should not be null");
+ if (stream == null || stream.length() == 0) {
+ throw new IllegalArgumentException("'stream' should not be null");
+ }
this.outputsFields.put(stream, fields);
return this;
}
@@ -131,8 +128,6 @@ public abstract class BaseCassandraBolt<T> extends BaseTickTupleAwareRichBolt {
/**
* Takes the given {@code config} for creating cassandra client.
* {@link CassandraConf} contains all the properties that can be configured.
- *
- * @param config
*/
public BaseCassandraBolt withCassandraConfig(Map<String, Object> config) {
if (config == null) {
@@ -143,7 +138,9 @@ public abstract class BaseCassandraBolt<T> extends BaseTickTupleAwareRichBolt {
}
protected ExecutionResultHandler getResultHandler() {
- if (resultHandler == null) resultHandler = new BaseExecutionResultHandler();
+ if (resultHandler == null) {
+ resultHandler = new BaseExecutionResultHandler();
+ }
return resultHandler;
}
@@ -151,7 +148,7 @@ public abstract class BaseCassandraBolt<T> extends BaseTickTupleAwareRichBolt {
return mapper;
}
- abstract protected AsyncResultHandler<T> getAsyncHandler();
+ protected abstract AsyncResultHandler<T> getAsyncHandler();
protected AsyncExecutor<T> getAsyncExecutor() {
return AsyncExecutorProvider.getLocal(session, getAsyncHandler());
@@ -176,7 +173,9 @@ public abstract class BaseCassandraBolt<T> extends BaseTickTupleAwareRichBolt {
// outputsFields can be empty if this bolt acts like a sink in topology.
if (!outputsFields.isEmpty()) {
Fields fields = outputsFields.remove(Utils.DEFAULT_STREAM_ID);
- if (fields != null) declarer.declare(fields);
+ if (fields != null) {
+ declarer.declare(fields);
+ }
for (Map.Entry<String, Fields> entry : outputsFields.entrySet()) {
declarer.declareStream(entry.getKey(), entry.getValue());
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java
index d87ecab..12c4eac 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/BatchCassandraWriterBolt.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
public class BatchCassandraWriterBolt extends BaseCassandraBolt<List<Tuple>> {
public static final int DEFAULT_EMIT_FREQUENCY = 2;
- private final static Logger LOG = LoggerFactory.getLogger(BatchCassandraWriterBolt.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BatchCassandraWriterBolt.class);
private LinkedBlockingQueue<Tuple> queue;
private int tickFrequencyInSeconds;
@@ -41,14 +41,12 @@ public class BatchCassandraWriterBolt extends BaseCassandraBolt<List<Tuple>> {
private int batchMaxSize = 1000;
- private String componentID;
+ private String componentId;
private AsyncResultHandler<List<Tuple>> asyncResultHandler;
/**
* Creates a new {@link CassandraWriterBolt} instance.
- *
- * @param tupleMapper
*/
public BatchCassandraWriterBolt(CQLStatementTupleMapper tupleMapper) {
this(tupleMapper, DEFAULT_EMIT_FREQUENCY);
@@ -56,8 +54,6 @@ public class BatchCassandraWriterBolt extends BaseCassandraBolt<List<Tuple>> {
/**
* Creates a new {@link CassandraWriterBolt} instance.
- *
- * @param tupleMapper
*/
public BatchCassandraWriterBolt(CQLStatementTupleMapper tupleMapper, int tickFrequencyInSeconds) {
super(tupleMapper);
@@ -70,7 +66,7 @@ public class BatchCassandraWriterBolt extends BaseCassandraBolt<List<Tuple>> {
@Override
public void prepare(Map<String, Object> topoConfig, TopologyContext topologyContext, OutputCollector outputCollector) {
super.prepare(topoConfig, topologyContext, outputCollector);
- this.componentID = topologyContext.getThisComponentId();
+ this.componentId = topologyContext.getThisComponentId();
this.queue = new LinkedBlockingQueue<>(batchMaxSize);
this.lastModifiedTimesMillis = now();
}
@@ -144,8 +140,9 @@ public class BatchCassandraWriterBolt extends BaseCassandraBolt<List<Tuple>> {
for (Tuple t : inputs) {
List<Statement> sl = getMapper().map(topoConfig, session, t);
- for (Statement s : sl)
+ for (Statement s : sl) {
stmts.add(new PairStatementTuple(t, s));
+ }
}
return stmts;
}
@@ -158,7 +155,7 @@ public class BatchCassandraWriterBolt extends BaseCassandraBolt<List<Tuple>> {
}
private String logPrefix() {
- return componentID + " - ";
+ return componentId + " - ";
}
public BatchCassandraWriterBolt withTickFrequency(long time, TimeUnit unit) {
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java
index fc45b3f..d802941 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/CassandraWriterBolt.java
@@ -25,8 +25,6 @@ public class CassandraWriterBolt extends BaseCassandraBolt<Tuple> {
/**
* Creates a new {@link CassandraWriterBolt} instance.
- *
- * @param tupleMapper
*/
public CassandraWriterBolt(CQLStatementTupleMapper tupleMapper) {
super(tupleMapper);
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/GroupingBatchBuilder.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/GroupingBatchBuilder.java
index 3697f81..f7ad027 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/GroupingBatchBuilder.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/GroupingBatchBuilder.java
@@ -20,9 +20,6 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.storm.tuple.Tuple;
-/**
- *
- */
public class GroupingBatchBuilder implements Iterable<PairBatchStatementTuples> {
private int batchSizeRows;
@@ -31,7 +28,6 @@ public class GroupingBatchBuilder implements Iterable<PairBatchStatementTuples>
/**
* Creates a new {@link GroupingBatchBuilder} instance.
- * @param batchSizeRows
*/
public GroupingBatchBuilder(int batchSizeRows, List<PairStatementTuple> statements) {
this.batchSizeRows = batchSizeRows;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairStatementTuple.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairStatementTuple.java
index d95e9d3..34cec23 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairStatementTuple.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/bolt/PairStatementTuple.java
@@ -26,8 +26,6 @@ public class PairStatementTuple {
/**
* Creates a new {@link PairStatementTuple} instance.
- * @param tuple
- * @param statement
*/
public PairStatementTuple(Tuple tuple, Statement statement) {
this.tuple = tuple;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/CassandraConf.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/CassandraConf.java
index 82f017f..e1ebbcb 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/CassandraConf.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/CassandraConf.java
@@ -62,7 +62,7 @@ public class CassandraConf implements Serializable {
*/
private String username;
/**
- * The authorized cassandra password
+ * The authorized cassandra password.
*/
private String password;
/**
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/impl/DefaultClient.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/impl/DefaultClient.java
index d8495cc..656ab5c 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/impl/DefaultClient.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/client/impl/DefaultClient.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
*/
public class DefaultClient implements SimpleClient, Closeable, Serializable {
- private final static Logger LOG = LoggerFactory.getLogger(DefaultClient.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultClient.class);
private String keyspace;
@@ -72,8 +72,9 @@ public class DefaultClient implements SimpleClient, Closeable, Serializable {
public synchronized Session connect() throws NoHostAvailableException {
if (isDisconnected()) {
LOG.info("Connected to cluster: {}", cluster.getClusterName());
- for (Host host : getAllHosts())
+ for (Host host : getAllHosts()) {
LOG.info("Datacenter: {}; Host: {}; Rack: {}", host.getDatacenter(), host.getAddress(), host.getRack());
+ }
LOG.info("Connect to cluster using keyspace %s", keyspace);
session = cluster.connect(keyspace);
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java
index 0c1964e..de6afaf 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BaseBeanFactory.java
@@ -36,7 +36,9 @@ public abstract class BaseBeanFactory<T> implements BeanFactory<T> {
*/
@Override
public synchronized T get(Map<String, Object> topoConf) {
- if (instance != null) return instance;
+ if (instance != null) {
+ return instance;
+ }
return instance = make(topoConf);
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java
index fb712a5..8dbbbae 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/BeanFactory.java
@@ -22,14 +22,12 @@ public interface BeanFactory<T> extends Serializable {
/**
* Sets the storm context.
- * @param context
*/
public void setStormContext(WorkerCtx context);
/**
* Return an instance, which may be shared or independent, of the specified type.
* @param topoConf The storm configuration
- * @return
*/
T get(Map<String, Object> topoConf);
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/WorkerCtx.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/WorkerCtx.java
index 1a457f9..a6f771b 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/WorkerCtx.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/context/WorkerCtx.java
@@ -43,19 +43,19 @@ public class WorkerCtx implements Serializable {
/**
* Return an instance provider of the specified type.
- * @throws RuntimeException if no bean provider can be resolve for the given class.
- * @return
+ * @throws RuntimeException if no bean provider can be resolve for the given class
*/
protected <T> BeanFactory<T> getBeanfactory(Class<T> clazz) {
BeanFactory<T> factory = (BeanFactory<T>) this.componentCtx.get(clazz);
- if (factory == null) throw new RuntimeException("Cannot resolve bean factory for class : " + clazz.getCanonicalName());
+ if (factory == null) {
+ throw new RuntimeException("Cannot resolve bean factory for class : " + clazz.getCanonicalName());
+ }
factory.setStormContext(this);
return factory;
}
/**
* Return an instance, which is shared (within a Worker), of the specified type.
- * @return
*/
public <T, K, V> T getWorkerBean(Class<T> clazz, Map<K, V> topoConf) {
return getWorkerBean(clazz, topoConf, false);
@@ -71,7 +71,9 @@ public class WorkerCtx implements Serializable {
* @return a instance of type {@link T}.
*/
public <T, K, V> T getWorkerBean(Class<T> clazz, Map<K, V> topoConf, boolean force) {
- if (force) workerCtx.remove(clazz);
+ if (force) {
+ workerCtx.remove(clazz);
+ }
BeanFactory<T> factory = (BeanFactory<T>) this.workerCtx.get(clazz);
if (factory == null) {
BeanFactory<T> instance = getBeanfactory(clazz).newInstance();
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncExecutor.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncExecutor.java
index 53e6ee6..eec9026 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncExecutor.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/AsyncExecutor.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
*/
public class AsyncExecutor<T> implements Serializable {
- private final static Logger LOG = LoggerFactory.getLogger(AsyncExecutor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AsyncExecutor.class);
protected Session session;
@@ -79,8 +79,9 @@ public class AsyncExecutor<T> implements Serializable {
List<SettableFuture<T>> settableFutures = new ArrayList<>(statements.size());
- for (Statement s : statements)
+ for (Statement s : statements) {
settableFutures.add(execAsync(s, input, AsyncResultHandler.NO_OP_HANDLER));
+ }
ListenableFuture<List<T>> allAsList = Futures.allAsList(settableFutures);
Futures.addCallback(allAsList, new FutureCallback<List<T>>() {
@@ -272,12 +273,12 @@ public class AsyncExecutor<T> implements Serializable {
int top5 = Math.min(exceptions.size(), 5);
StringBuilder sb = new StringBuilder();
sb.append("First ")
- .append(top5)
- .append(" exceptions: ")
- .append(System.lineSeparator());
+ .append(top5)
+ .append(" exceptions: ")
+ .append(System.lineSeparator());
for (int i = 0; i < top5; i++) {
sb.append(exceptions.get(i).getMessage())
- .append(System.lineSeparator());
+ .append(System.lineSeparator());
}
return sb.toString();
}
@@ -287,13 +288,13 @@ public class AsyncExecutor<T> implements Serializable {
StringBuilder sb = new StringBuilder();
sb.append(getMessage())
- .append(System.lineSeparator())
- .append("Multiple exceptions encountered: ")
- .append(System.lineSeparator());
+ .append(System.lineSeparator())
+ .append("Multiple exceptions encountered: ")
+ .append(System.lineSeparator());
for (Throwable exception : exceptions) {
sb.append(exception.toString())
- .append(System.lineSeparator());
+ .append(System.lineSeparator());
}
return super.toString();
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java
index 44721ad..8c8057d 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/ExecutionResultCollector.java
@@ -51,8 +51,12 @@ public interface ExecutionResultCollector {
*/
@Override
public void handle(OutputCollector collector, ExecutionResultHandler handler) {
- for (Tuple t : inputs) handler.onQuerySuccess(collector, t);
- for (Tuple t : inputs) collector.ack(t);
+ for (Tuple t : inputs) {
+ handler.onQuerySuccess(collector, t);
+ }
+ for (Tuple t : inputs) {
+ collector.ack(t);
+ }
}
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java
index 27139fa..f2ad2a6 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/BatchAsyncResultHandler.java
@@ -20,7 +20,6 @@ import org.apache.storm.cassandra.executor.ExecutionResultCollector;
import org.apache.storm.task.OutputCollector;
import org.apache.storm.tuple.Tuple;
-
public class BatchAsyncResultHandler implements AsyncResultHandler<List<Tuple>> {
private ConcurrentLinkedQueue<ExecutionResultCollector> completed;
@@ -29,7 +28,6 @@ public class BatchAsyncResultHandler implements AsyncResultHandler<List<Tuple>>
/**
* Creates a new {@link BatchAsyncResultHandler} instance.
- * @param handler
*/
public BatchAsyncResultHandler(ExecutionResultHandler handler) {
this.handler = handler;
@@ -39,7 +37,7 @@ public class BatchAsyncResultHandler implements AsyncResultHandler<List<Tuple>>
/**
* This method is responsible for failing specified inputs.
*
- * The default method does no-operation.
+ * <p>The default method does no-operation.
*/
@Override
public void failure(Throwable t, List<Tuple> input) {
@@ -49,7 +47,7 @@ public class BatchAsyncResultHandler implements AsyncResultHandler<List<Tuple>>
/**
* This method is responsible for acknowledging specified inputs.
*
- * The default method does no-operation.
+ * <p>The default method does no-operation.
*/
@Override
public void success(List<Tuple> input) {
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java
index 127a06d..f24988d 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/executor/impl/SingleAsyncResultHandler.java
@@ -19,7 +19,6 @@ import org.apache.storm.cassandra.executor.ExecutionResultCollector;
import org.apache.storm.task.OutputCollector;
import org.apache.storm.tuple.Tuple;
-
public class SingleAsyncResultHandler implements AsyncResultHandler<Tuple> {
private ConcurrentLinkedQueue<ExecutionResultCollector> completed;
@@ -28,7 +27,6 @@ public class SingleAsyncResultHandler implements AsyncResultHandler<Tuple> {
/**
* Creates a new {@link SingleAsyncResultHandler} instance.
- * @param handler
*/
public SingleAsyncResultHandler(ExecutionResultHandler handler) {
this.handler = handler;
@@ -38,7 +36,7 @@ public class SingleAsyncResultHandler implements AsyncResultHandler<Tuple> {
/**
* This method is responsible for failing specified inputs.
*
- * The default method does no-operation.
+ * <p>The default method does no-operation.
*/
@Override
public void failure(Throwable t, Tuple input) {
@@ -48,7 +46,7 @@ public class SingleAsyncResultHandler implements AsyncResultHandler<Tuple> {
/**
* This method is responsible for acknowledging specified inputs.
*
- * The default method does no-operation.
+ * <p>The default method does no-operation.
*/
@Override
public void success(Tuple input) {
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/AyncCQLResultSetValuesMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/AyncCQLResultSetValuesMapper.java
index f57a99c..c6b331f 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/AyncCQLResultSetValuesMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/AyncCQLResultSetValuesMapper.java
@@ -20,8 +20,9 @@ import org.apache.storm.tuple.ITuple;
import org.apache.storm.tuple.Values;
/**
- * A resultset mapper that
+ * A resultset mapper that.
*/
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public interface AyncCQLResultSetValuesMapper extends Serializable {
List<List<Values>> map(Session session, List<Statement> statements, List<ITuple> tuples);
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java
index 9cbac15..100772b 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/BaseCQLStatementTupleMapper.java
@@ -22,8 +22,8 @@ import org.apache.storm.tuple.ITuple;
/**
* Default interface to map a {@link org.apache.storm.tuple.ITuple} to a CQL {@link com.datastax.driver.core.Statement}.
- *
*/
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public abstract class BaseCQLStatementTupleMapper implements CQLStatementTupleMapper, Serializable {
/**
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLResultSetValuesMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLResultSetValuesMapper.java
index 2d50161..87f3830 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLResultSetValuesMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLResultSetValuesMapper.java
@@ -19,9 +19,7 @@ import java.util.List;
import org.apache.storm.tuple.ITuple;
import org.apache.storm.tuple.Values;
-/**
- *
- */
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public interface CQLResultSetValuesMapper extends Serializable {
List<List<Values>> map(Session session, Statement statement, ITuple tuple);
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementBuilder.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementBuilder.java
index c12aad0..8a9b4d3 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementBuilder.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementBuilder.java
@@ -14,7 +14,7 @@ package org.apache.storm.cassandra.query;
import java.io.Serializable;
-
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public interface CQLStatementBuilder<T extends CQLStatementTupleMapper> extends Serializable {
/**
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java
index ccc8bc8..29290a2 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CQLStatementTupleMapper.java
@@ -23,6 +23,7 @@ import org.apache.storm.tuple.ITuple;
/**
* Default interface to map a {@link org.apache.storm.tuple.ITuple} to a CQL {@link com.datastax.driver.core.Statement}.
*/
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public interface CQLStatementTupleMapper extends Serializable {
/**
@@ -35,6 +36,7 @@ public interface CQLStatementTupleMapper extends Serializable {
*/
List<Statement> map(Map<String, Object> conf, Session session, ITuple tuple);
+ @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public static class DynamicCQLStatementTupleMapper implements CQLStatementTupleMapper {
private List<CQLStatementBuilder> builders;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/Column.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/Column.java
index dd94c28..097f4df 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/Column.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/Column.java
@@ -16,9 +16,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-/**
- *
- */
public class Column<T> implements Serializable {
private final String columnName;
@@ -31,8 +28,9 @@ public class Column<T> implements Serializable {
public static Object[] getVals(List<Column> columns) {
List<Object> vals = new ArrayList<>(columns.size());
- for (Column c : columns)
+ for (Column c : columns) {
vals.add(c.getVal());
+ }
return vals.toArray();
}
@@ -44,17 +42,27 @@ public class Column<T> implements Serializable {
return val;
}
- public boolean isNull() { return val == null;}
+ public boolean isNull() {
+ return val == null;
+ }
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
Column column = (Column) o;
- if (columnName != null ? !columnName.equals(column.columnName) : column.columnName != null) return false;
- if (val != null ? !val.equals(column.val) : column.val != null) return false;
+ if (columnName != null ? !columnName.equals(column.columnName) : column.columnName != null) {
+ return false;
+ }
+ if (val != null ? !val.equals(column.val) : column.val != null) {
+ return false;
+ }
return true;
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java
index bab39eb..f308540 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/ContextQuery.java
@@ -19,7 +19,6 @@ import org.apache.storm.tuple.ITuple;
/**
* This interface may be used to retrieve a cassandra bound query either from storm config
* or the tuple being proceed.
- *
*/
public interface ContextQuery extends Serializable {
@@ -41,7 +40,6 @@ public interface ContextQuery extends Serializable {
/**
* Creates a new {@link StaticContextQuery} instance.
- * @param value
*/
public StaticContextQuery(String value) {
this.value = value;
@@ -66,7 +64,9 @@ public interface ContextQuery extends Serializable {
@Override
public String resolves(Map<String, Object> config, ITuple tuple) {
- if (config.containsKey(key)) return (String) config.get(key);
+ if (config.containsKey(key)) {
+ return (String) config.get(key);
+ }
throw new IllegalArgumentException("Bound query '" + key + "' does not exist in configuration");
}
@@ -87,7 +87,9 @@ public interface ContextQuery extends Serializable {
@Override
public String resolves(Map<String, Object> config, ITuple tuple) {
String name = tuple.getStringByField(fieldName);
- if (config.containsKey(name)) return (String) config.get(name);
+ if (config.containsKey(name)) {
+ return (String) config.get(name);
+ }
throw new IllegalArgumentException("Bound query '" + name + "' does not exist in configuration");
}
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java
index 538da8d..9a1892b 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/CqlMapper.java
@@ -49,8 +49,9 @@ public interface CqlMapper extends Serializable {
@Override
public List<Column> map(ITuple tuple) {
List<Column> columns = new ArrayList<>(selectors.size());
- for (FieldSelector selector : selectors)
+ for (FieldSelector selector : selectors) {
columns.add(selector.select(tuple));
+ }
return columns;
}
}
@@ -71,8 +72,9 @@ public interface CqlMapper extends Serializable {
@Override
public List<Column> map(ITuple tuple) {
List<Column> columns = new ArrayList<>(tuple.size());
- for (String name : tuple.getFields())
+ for (String name : tuple.getFields()) {
columns.add(new Column(name, tuple.getValueByField(name)));
+ }
return columns;
}
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/BoundCQLStatementMapperBuilder.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/BoundCQLStatementMapperBuilder.java
index 271ec3d..2cf23b7 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/BoundCQLStatementMapperBuilder.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/BoundCQLStatementMapperBuilder.java
@@ -12,6 +12,8 @@
package org.apache.storm.cassandra.query.builder;
+import static org.apache.storm.cassandra.query.ContextQuery.StaticContextQuery;
+
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
@@ -23,8 +25,7 @@ import org.apache.storm.cassandra.query.impl.PreparedStatementBinder;
import org.apache.storm.cassandra.query.impl.RoutingKeyGenerator;
import org.apache.storm.cassandra.query.selector.FieldSelector;
-import static org.apache.storm.cassandra.query.ContextQuery.StaticContextQuery;
-
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class BoundCQLStatementMapperBuilder implements CQLStatementBuilder<BoundCQLStatementTupleMapper>, Serializable {
private final ContextQuery contextQuery;
@@ -37,7 +38,6 @@ public class BoundCQLStatementMapperBuilder implements CQLStatementBuilder<Bound
/**
* Creates a new {@link BoundCQLStatementMapperBuilder} instance.
- * @param cql
*/
public BoundCQLStatementMapperBuilder(String cql) {
this.contextQuery = new StaticContextQuery(cql);
@@ -45,7 +45,6 @@ public class BoundCQLStatementMapperBuilder implements CQLStatementBuilder<Bound
/**
* Creates a new {@link BoundCQLStatementMapperBuilder} instance.
- * @param contextQuery
*/
public BoundCQLStatementMapperBuilder(ContextQuery contextQuery) {
this.contextQuery = contextQuery;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/SimpleCQLStatementMapperBuilder.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/SimpleCQLStatementMapperBuilder.java
index 0349310..70a9cc4 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/SimpleCQLStatementMapperBuilder.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/builder/SimpleCQLStatementMapperBuilder.java
@@ -25,6 +25,7 @@ import org.apache.storm.cassandra.query.selector.FieldSelector;
/**
* Default class to build {@link org.apache.storm.cassandra.query.impl.SimpleCQLStatementMapper} instance.
*/
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class SimpleCQLStatementMapperBuilder implements CQLStatementBuilder<SimpleCQLStatementMapper>, Serializable {
private final String queryString;
@@ -67,11 +68,6 @@ public class SimpleCQLStatementMapperBuilder implements CQLStatementBuilder<Simp
return this;
}
- public final SimpleCQLStatementMapperBuilder withRoutingKeys(String... fields) {
- this.routingKeys = Arrays.asList(fields);
- return this;
- }
-
/**
* Includes only the specified tuple fields.
*
@@ -81,5 +77,10 @@ public class SimpleCQLStatementMapperBuilder implements CQLStatementBuilder<Simp
this.mapper = mapper;
return this;
}
+
+ public final SimpleCQLStatementMapperBuilder withRoutingKeys(String... fields) {
+ this.routingKeys = Arrays.asList(fields);
+ return this;
+ }
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java
index 8d68a1e..860af67 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BatchCQLStatementTupleMapper.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.storm.cassandra.query.CQLStatementTupleMapper;
import org.apache.storm.tuple.ITuple;
-
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class BatchCQLStatementTupleMapper implements CQLStatementTupleMapper {
private final List<CQLStatementTupleMapper> mappers;
@@ -30,8 +30,6 @@ public class BatchCQLStatementTupleMapper implements CQLStatementTupleMapper {
/**
* Creates a new {@link BatchCQLStatementTupleMapper} instance.
- * @param type
- * @param mappers
*/
public BatchCQLStatementTupleMapper(BatchStatement.Type type, List<CQLStatementTupleMapper> mappers) {
this.mappers = new ArrayList<>(mappers);
@@ -44,8 +42,9 @@ public class BatchCQLStatementTupleMapper implements CQLStatementTupleMapper {
@Override
public List<Statement> map(Map<String, Object> conf, Session session, ITuple tuple) {
final BatchStatement batch = new BatchStatement(this.type);
- for (CQLStatementTupleMapper m : mappers)
+ for (CQLStatementTupleMapper m : mappers) {
batch.addAll(m.map(conf, session, tuple));
+ }
return Arrays.asList((Statement) batch);
}
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java
index 40e2c34..e817f16 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/BoundCQLStatementTupleMapper.java
@@ -27,6 +27,7 @@ import org.apache.storm.cassandra.query.ContextQuery;
import org.apache.storm.cassandra.query.CqlMapper;
import org.apache.storm.tuple.ITuple;
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class BoundCQLStatementTupleMapper implements CQLStatementTupleMapper {
private final ContextQuery contextQuery;
@@ -38,12 +39,6 @@ public class BoundCQLStatementTupleMapper implements CQLStatementTupleMapper {
/**
* Creates a new {@link BoundCQLStatementTupleMapper} instance.
- *
- * @param contextQuery
- * @param mapper
- * @param mapper
- * @param rkGenerator
- * @param binder
*/
public BoundCQLStatementTupleMapper(ContextQuery contextQuery, CqlMapper mapper, RoutingKeyGenerator rkGenerator,
PreparedStatementBinder binder) {
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/ObjectMapperCqlStatementMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/ObjectMapperCqlStatementMapper.java
index 4f5a021..f60c76c 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/ObjectMapperCqlStatementMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/ObjectMapperCqlStatementMapper.java
@@ -34,8 +34,9 @@ import org.apache.storm.cassandra.query.ObjectMapperOperation;
import org.apache.storm.tuple.ITuple;
/**
- * Tuple mapper that is able to map objects annotated with {@link com.datastax.driver.mapping.annotations.Table} to CQL statements
+ * Tuple mapper that is able to map objects annotated with {@link com.datastax.driver.mapping.annotations.Table} to CQL statements.
*/
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class ObjectMapperCqlStatementMapper implements CQLStatementTupleMapper {
private static final Map<Session, MappingManager> mappingManagers = new WeakHashMap<>();
@@ -83,7 +84,7 @@ public class ObjectMapperCqlStatementMapper implements CQLStatementTupleMapper {
options.add(Option.timestamp(((Number) timestampObject).longValue()));
} else if (timestampObject instanceof Instant) {
Instant timestamp = (Instant) timestampObject;
- options.add(Option.timestamp(timestamp.getEpochSecond() * 1000_0000l + timestamp.getNano() / 1000l));
+ options.add(Option.timestamp(timestamp.getEpochSecond() * 1000_0000L + timestamp.getNano() / 1000L));
}
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/PreparedStatementBinder.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/PreparedStatementBinder.java
index 5a4d39e..1c82ee6 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/PreparedStatementBinder.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/PreparedStatementBinder.java
@@ -19,9 +19,6 @@ import java.io.Serializable;
import java.util.List;
import org.apache.storm.cassandra.query.Column;
-/**
- *
- */
public interface PreparedStatementBinder extends Serializable {
public BoundStatement apply(PreparedStatement statement, List<Column> columns);
@@ -38,6 +35,7 @@ public interface PreparedStatementBinder extends Serializable {
}
}
+ @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public static final class CQL3NamedSettersBinder implements PreparedStatementBinder {
/**
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/RoutingKeyGenerator.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/RoutingKeyGenerator.java
index 948a21f..2c1e238 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/RoutingKeyGenerator.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/RoutingKeyGenerator.java
@@ -27,7 +27,6 @@ public class RoutingKeyGenerator implements Serializable {
/**
* Creates a new {@link RoutingKeyGenerator} instance.
- * @param routingKeys
*/
public RoutingKeyGenerator(List<String> routingKeys) {
Preconditions.checkNotNull(routingKeys);
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java
index 17a9049..f3daf59 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/impl/SimpleCQLStatementMapper.java
@@ -25,9 +25,7 @@ import org.apache.storm.cassandra.query.Column;
import org.apache.storm.cassandra.query.CqlMapper;
import org.apache.storm.tuple.ITuple;
-/**
- *
- */
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class SimpleCQLStatementMapper implements CQLStatementTupleMapper {
private final String queryString;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/selector/FieldSelector.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/selector/FieldSelector.java
index dd9222a..28d9506 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/selector/FieldSelector.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/query/selector/FieldSelector.java
@@ -25,7 +25,7 @@ public class FieldSelector implements Serializable {
/**
* Creates a new {@link FieldSelector} instance.
- * @param field the name of value.
+ * @param field the name of value
*/
public FieldSelector(String field) {
this.field = field;
@@ -36,8 +36,8 @@ public class FieldSelector implements Serializable {
}
/**
- * @param tuple
- * @return Compute the value of this field from given {@code tuple}.
+ * Get field value.
+ * @return Compute the value of this field from given {@code tuple}
*/
protected Object getFieldValue(ITuple tuple) {
return tuple.getValueByField(field);
@@ -45,7 +45,7 @@ public class FieldSelector implements Serializable {
/**
* Sets the fields as an automatically generated TimeUUID.
- * @return this.
+ * @return this
*/
public FieldSelector now() {
this.isNow = true;
@@ -55,8 +55,8 @@ public class FieldSelector implements Serializable {
/**
* Sets an alias for this field.
*
- * @param as the alias name.
- * @return this.
+ * @param as the alias name
+ * @return this
*/
public FieldSelector as(String as) {
this.as = as;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraBackingMap.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraBackingMap.java
index 61f9001..98bdbdb 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraBackingMap.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraBackingMap.java
@@ -43,22 +43,20 @@ import org.slf4j.LoggerFactory;
/**
* An IBackingState implementation for Cassandra.
*
- * The implementation stores state as a binary blob in cassandra using a {@link Serializer}.
+ * <p>The implementation stores state as a binary blob in cassandra using a {@link Serializer}.
* It supports Opaque, Transactional and NonTransactional states, given a matching serializer.
*
- * Configuration is done with three separate constructs:
+ * <p>Configuration is done with three separate constructs:
* - One tuple mapper for multiGet, which should map keys to a select statement and return {@link Values}.
* - One state mapper, which maps the state to/from a {@link Values} representation, which is used for binding.
* - One tuple mapper for multiPut, which should map {@link Values} to an INSERT or UPDATE statement.
*
- * {@link #multiPut(List, List)} updates Cassandra with parallel statements.
+ * <p>{@link #multiPut(List, List)} updates Cassandra with parallel statements.
* {@link #multiGet(List)} queries Cassandra with parallel statements.
*
- * Parallelism defaults to half the maximum requests per host, either local or remote whichever is
+ * <p>Parallelism defaults to half the maximum requests per host, either local or remote whichever is
* lower. The driver defaults to 256 for remote hosts and 1024 for local hosts, so the default value is 128
* unless the driver is configured otherwise.
- *
- * @param <T>
*/
public class CassandraBackingMap<T> implements IBackingMap<T> {
@@ -173,6 +171,7 @@ public class CassandraBackingMap<T> implements IBackingMap<T> {
return this;
}
+ @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public Options<T> withNonTransactionalJSONBinaryState(String fieldName) {
this.stateMapper = new SerializedStateMapper<>(fieldName, new JSONNonTransactionalSerializer());
return this;
@@ -183,6 +182,7 @@ public class CassandraBackingMap<T> implements IBackingMap<T> {
return this;
}
+ @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public Options<T> withTransactionalJSONBinaryState(String fieldName) {
this.stateMapper = new SerializedStateMapper<>(fieldName, new JSONTransactionalSerializer());
return this;
@@ -193,6 +193,7 @@ public class CassandraBackingMap<T> implements IBackingMap<T> {
return this;
}
+ @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public Options<T> withOpaqueJSONBinaryState(String fieldName) {
this.stateMapper = new SerializedStateMapper<>(fieldName, new JSONOpaqueSerializer());
return this;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraMapStateFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraMapStateFactory.java
index 5b82a6b..a1a5c4c 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraMapStateFactory.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraMapStateFactory.java
@@ -29,9 +29,8 @@ import org.apache.storm.trident.state.map.TransactionalMap;
/**
* A StateFactory implementation that creates a MapState backed by CassandraBackingMap.
*
- * The statefactory supports opaque, transactional and non-transactional configurations.
+ * <p>The statefactory supports opaque, transactional and non-transactional configurations.
* Optionally, the backing map can be wrapped in a {@link CachedMap} by specifying {@link #withCache} (off by default).
- *
*/
public class CassandraMapStateFactory implements StateFactory {
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraQuery.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraQuery.java
index 4fafa61..271f9e7 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraQuery.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraQuery.java
@@ -18,9 +18,6 @@ import org.apache.storm.trident.state.BaseQueryFunction;
import org.apache.storm.trident.tuple.TridentTuple;
import org.apache.storm.tuple.Values;
-/**
- *
- */
public class CassandraQuery extends BaseQueryFunction<CassandraState, List<Values>> {
@Override
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java
index 9ecae36..c446a18 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraState.java
@@ -32,9 +32,6 @@ import org.apache.storm.tuple.Values;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- */
public class CassandraState implements State {
private static final Logger LOG = LoggerFactory.getLogger(CassandraState.class);
@@ -131,11 +128,13 @@ public class CassandraState implements State {
this.clientProvider = clientProvider;
}
+ @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public Options withCQLStatementTupleMapper(CQLStatementTupleMapper cqlStatementTupleMapper) {
this.cqlStatementTupleMapper = cqlStatementTupleMapper;
return this;
}
+ @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public Options withCQLResultSetValuesMapper(CQLResultSetValuesMapper cqlResultSetValuesMapper) {
this.cqlResultSetValuesMapper = cqlResultSetValuesMapper;
return this;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java
index fcdbb1c..f42d6b0 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateFactory.java
@@ -20,9 +20,6 @@ import org.apache.storm.task.IMetricsContext;
import org.apache.storm.trident.state.State;
import org.apache.storm.trident.state.StateFactory;
-/**
- *
- */
public class CassandraStateFactory implements StateFactory {
private final CassandraState.Options options;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateUpdater.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateUpdater.java
index e4bb380..cf63691 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateUpdater.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/CassandraStateUpdater.java
@@ -17,9 +17,6 @@ import org.apache.storm.trident.operation.TridentCollector;
import org.apache.storm.trident.state.BaseStateUpdater;
import org.apache.storm.trident.tuple.TridentTuple;
-/**
- *
- */
public class CassandraStateUpdater extends BaseStateUpdater<CassandraState> {
@Override
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/MapStateFactoryBuilder.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/MapStateFactoryBuilder.java
index ed8ab71..82122f9 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/MapStateFactoryBuilder.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/MapStateFactoryBuilder.java
@@ -12,6 +12,13 @@
package org.apache.storm.cassandra.trident.state;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+import static org.apache.storm.cassandra.DynamicStatementBuilder.all;
+import static org.apache.storm.cassandra.DynamicStatementBuilder.boundQuery;
+
import com.datastax.driver.core.querybuilder.Insert;
import com.datastax.driver.core.querybuilder.Select;
import java.util.ArrayList;
@@ -33,36 +40,29 @@ import org.apache.storm.tuple.Fields;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto;
-import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
-import static org.apache.storm.cassandra.DynamicStatementBuilder.all;
-import static org.apache.storm.cassandra.DynamicStatementBuilder.boundQuery;
-
/**
* A helper for building a MapState backed by Cassandra. It internalizes some common
* implementation choices to simplify usage.
*
- * In the simplest use case, a map state can be constructed with:
+ * <p>In the simplest use case, a map state can be constructed with:
*
- * StateFactory mapState = MapStateFactoryBuilder.opaque()
+ * <p>StateFactory mapState = MapStateFactoryBuilder.opaque()
* .withTable("mykeyspace", "year_month_state")
* .withKeys("year", "month")
* .withJSONBinaryState("state")
* .build();
*
- * for a cassandra table with:
+ * <p>for a cassandra table with:
* mykeyspace.year_month_state {
* year: int,
* month: int,
* state: blob
* }
*
- * This will use the storm JSON serializers to convert the state to and from binary format.
+ * <p>This will use the storm JSON serializers to convert the state to and from binary format.
* Other binary serializers can be used with the {@link #withBinaryState(String, Serializer)} method.
*
- * Storing state in explicit fields (e.g. in a field "sum" of type int) is possible by instead calling
+ * <p>Storing state in explicit fields (e.g. in a field "sum" of type int) is possible by instead calling
* {@link #withStateMapper(StateMapper)}. For instance, you can use {@link NonTransactionalTupleStateMapper},
* {@link TransactionalTupleStateMapper} or {@link OpaqueTupleStateMapper} if your state values are tuples.
*
@@ -114,7 +114,7 @@ public class MapStateFactoryBuilder<T> {
return this;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public MapStateFactoryBuilder<T> withJSONBinaryState(String stateField) {
switch (stateType) {
case OPAQUE:
@@ -215,9 +215,10 @@ public class MapStateFactoryBuilder<T> {
case OPAQUE:
return CassandraMapStateFactory.opaque(options, cassandraConfig)
.withCache(cacheSize);
+ default:
+ throw new IllegalArgumentException(String.format("stateType %s not supported",
+ stateType));
}
-
- return null;
}
}
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/OpaqueTupleStateMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/OpaqueTupleStateMapper.java
index a7e857b..f79f67b 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/OpaqueTupleStateMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/OpaqueTupleStateMapper.java
@@ -80,6 +80,7 @@ public class OpaqueTupleStateMapper implements StateMapper<OpaqueValue<ITuple>>
}
Values values = valuesList.get(0);
int index = 0;
+ @SuppressWarnings("checkstyle:VariableDeclarationUsageDistance")
Long currTx = (Long) values.get(index++);
SimpleTuple curr = new SimpleTuple(tupleFields);
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TransactionalTupleStateMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TransactionalTupleStateMapper.java
index 7b3d670..0e45d0f 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TransactionalTupleStateMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TransactionalTupleStateMapper.java
@@ -69,6 +69,7 @@ public class TransactionalTupleStateMapper implements StateMapper<TransactionalV
}
Values values = valuesList.get(0);
int index = 0;
+ @SuppressWarnings("checkstyle:VariableDeclarationUsageDistance")
Long txId = (Long) values.get(index++);
SimpleTuple curr = new SimpleTuple(tupleFields);
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentAyncCQLResultSetValuesMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentAyncCQLResultSetValuesMapper.java
index 0159eef..ad613c5 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentAyncCQLResultSetValuesMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentAyncCQLResultSetValuesMapper.java
@@ -33,6 +33,7 @@ import org.apache.storm.tuple.Values;
/**
* A result set mapper implementation which runs requests in parallel and waits for them all to finish.
*/
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class TridentAyncCQLResultSetValuesMapper implements AyncCQLResultSetValuesMapper {
private final Fields outputDeclaredFields;
private final Semaphore throttle;
diff --git a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java
index cd34362..62b4d97 100644
--- a/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java
+++ b/external/storm-cassandra/src/main/java/org/apache/storm/cassandra/trident/state/TridentResultSetValuesMapper.java
@@ -24,9 +24,6 @@ import org.apache.storm.tuple.Fields;
import org.apache.storm.tuple.ITuple;
import org.apache.storm.tuple.Values;
-/**
- *
- */
public class TridentResultSetValuesMapper implements CQLResultSetValuesMapper {
private Fields outputDeclaredFields;