You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ch...@apache.org on 2015/09/10 00:32:03 UTC
[15/50] [abbrv] incubator-apex-malhar git commit: Fix category, tags,
properties, and display names for app builder.
Fix category, tags, properties, and display names for app builder.
Conflicts:
library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/b7ba5212
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/b7ba5212
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/b7ba5212
Branch: refs/heads/master
Commit: b7ba52125a67eb0ece2dc5e55e8107db942f9106
Parents: c966479
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Tue Jul 28 18:21:14 2015 -0700
Committer: thomas <th...@datatorrent.com>
Committed: Tue Jul 28 21:29:13 2015 -0700
----------------------------------------------------------------------
.../accumulo/AbstractAccumuloInputOperator.java | 8 ++--
.../AbstractAccumuloOutputOperator.java | 8 ++--
.../contrib/accumulo/AccumuloStore.java | 30 ++++++-------
.../contrib/accumulo/AccumuloWindowStore.java | 16 +++----
.../aerospike/AbstractAerospikeGetOperator.java | 6 +--
...actAerospikeNonTransactionalPutOperator.java | 8 ++--
...stractAerospikeTransactionalPutOperator.java | 6 +--
.../contrib/aerospike/AerospikeStore.java | 10 ++---
.../aerospike/AerospikeTransactionalStore.java | 8 ++--
.../contrib/apachelog/ApplicationLocalLog.java | 2 +-
.../apachelog/ApplicationLogGenerator.java | 2 +-
.../contrib/apachelog/GeoIPExtractor.java | 2 +-
.../contrib/apachelog/TimestampExtractor.java | 2 +-
.../contrib/apachelog/UserAgentExtractor.java | 4 +-
.../AbstractCassandraInputOperator.java | 4 +-
...tCassandraTransactionableOutputOperator.java | 4 +-
...assandraTransactionableOutputOperatorPS.java | 4 +-
.../contrib/cassandra/CassandraStore.java | 4 +-
.../cassandra/CassandraTransactionalStore.java | 8 ++--
.../couchdb/AbstractCouchDBInputOperator.java | 4 +-
.../couchdb/AbstractCouchDBOutputOperator.java | 2 +-
.../couchdb/AbstractMapBasedInputOperator.java | 2 +-
.../contrib/couchdb/CouchDbStore.java | 4 +-
.../AbstractElasticSearchInputOperator.java | 18 ++++----
.../AbstractElasticSearchOutputOperator.java | 47 ++++++++++----------
.../ElasticSearchPercolatorOperator.java | 10 +++--
.../AbstractHBaseAppendOutputOperator.java | 6 +--
.../hbase/AbstractHBasePutOutputOperator.java | 10 ++---
...AbstractHBaseWindowAppendOutputOperator.java | 6 +--
.../AbstractHBaseWindowPutOutputOperator.java | 4 +-
.../hbase/HBaseCsvMappingPutOperator.java | 6 +--
.../contrib/hbase/HBaseGetOperator.java | 4 +-
.../contrib/hbase/HBaseInputOperator.java | 4 +-
.../hbase/HBaseNameValueCsvPutOperator.java | 10 ++---
.../contrib/hbase/HBaseOperatorBase.java | 6 +--
.../contrib/hbase/HBaseScanOperator.java | 4 +-
.../datatorrent/contrib/hbase/HBaseStore.java | 36 +++++++--------
.../contrib/hbase/HBaseWindowStore.java | 10 ++---
.../contrib/hive/FSPojoToHiveOperator.java | 7 ++-
.../datatorrent/contrib/hive/HiveOperator.java | 3 ++
.../kinesis/KinesisByteArrayOutputOperator.java | 6 +--
.../kinesis/KinesisStringOutputOperator.java | 3 +-
.../memcache/AbstractMemcacheInputOperator.java | 4 +-
.../AbstractMemcacheOutputOperator.java | 4 +-
.../AbstractMemcacheInputOperator.java | 4 +-
.../AbstractMemcacheOutputOperator.java | 4 +-
.../mongodb/MongoDBArrayListOutputOperator.java | 4 +-
.../mongodb/MongoDBHashMapOutputOperator.java | 4 +-
.../contrib/mongodb/MongoDBInputOperator.java | 4 +-
.../contrib/mongodb/MongoDBOutputOperator.java | 4 +-
.../AbstractRedisAggregateOutputOperator.java | 4 +-
.../redis/AbstractRedisInputOperator.java | 4 +-
.../redis/RedisKeyValPairOutputOperator.java | 4 +-
.../contrib/redis/RedisMapOutputOperator.java | 4 +-
...NumberSummationKeyValPairOutputOperator.java | 4 +-
.../RedisNumberSummationMapOutputOperator.java | 4 +-
.../splunk/AbstractSplunkInputOperator.java | 4 +-
.../contrib/splunk/SplunkTcpOutputOperator.java | 4 +-
.../contrib/sqlite/SqliteStreamOperator.java | 4 +-
.../datatorrent/lib/algo/FilterKeysHashMap.java | 2 +-
.../com/datatorrent/lib/algo/FirstMatchMap.java | 2 +-
.../datatorrent/lib/algo/FirstTillMatch.java | 2 +-
.../java/com/datatorrent/lib/algo/MatchMap.java | 2 +-
.../datatorrent/lib/algo/UniqueValueCount.java | 2 +-
.../snapshot/AppDataSnapshotServerMap.java | 4 +-
.../snapshot/AppDataSnapshotServerPOJO.java | 2 +-
...nsactionableKeyValueStoreOutputOperator.java | 2 +-
...egateTransactionableStoreOutputOperator.java | 2 +-
...BatchTransactionableStoreOutputOperator.java | 2 +-
.../db/AbstractKeyValueStoreInputOperator.java | 4 +-
...nsactionableKeyValueStoreOutputOperator.java | 4 +-
...sThruTransactionableStoreOutputOperator.java | 4 +-
.../lib/db/AbstractStoreInputOperator.java | 3 +-
.../lib/db/AbstractStoreOutputOperator.java | 3 +-
...tractTransactionableStoreOutputOperator.java | 4 +-
.../AbstractDBLookupCacheBackedOperator.java | 2 +-
...actJdbcNonTransactionableOutputOperator.java | 4 +-
...stractJdbcTransactionableOutputOperator.java | 4 +-
.../db/jdbc/JDBCLookupCacheBackedOperator.java | 2 +-
.../lib/io/AbstractFTPInputOperator.java | 6 ++-
.../io/AbstractKeyValueStoreOutputOperator.java | 6 +--
.../lib/io/PubSubWebSocketAppDataQuery.java | 4 +-
.../lib/io/PubSubWebSocketAppDataResult.java | 4 +-
.../datatorrent/lib/io/block/FSSliceReader.java | 3 ++
.../logs/ApacheLogParseMapOutputOperator.java | 4 +-
.../lib/logs/ApacheLogParseOperator.java | 4 +-
.../lib/logs/ApacheVirtualLogParseOperator.java | 4 +-
.../lib/logs/DimensionAggregationUnifier.java | 4 +-
.../lib/logs/FilteredLineToTokenArrayList.java | 4 +-
.../lib/logs/FilteredLineToTokenHashMap.java | 4 +-
.../lib/logs/FilteredLineTokenizerKeyVal.java | 4 +-
.../lib/logs/LineToTokenArrayList.java | 4 +-
.../lib/logs/LineToTokenHashMap.java | 4 +-
.../com/datatorrent/lib/logs/LineTokenizer.java | 2 +-
.../lib/logs/LineTokenizerKeyVal.java | 2 +-
.../logs/MultiWindowDimensionAggregation.java | 2 +-
.../lib/logs/RegexMatchMapOperator.java | 2 +-
.../com/datatorrent/lib/math/ChangeAlert.java | 10 ++---
.../datatorrent/lib/math/ChangeAlertKeyVal.java | 6 +--
.../datatorrent/lib/math/ChangeAlertMap.java | 6 +--
.../lib/multiwindow/AbstractSlidingWindow.java | 24 +++++-----
.../AbstractSlidingWindowKeyVal.java | 2 +-
.../lib/multiwindow/MultiWindowRangeKeyVal.java | 2 +-
.../lib/multiwindow/MultiWindowSumKeyVal.java | 2 +-
.../lib/multiwindow/SimpleMovingAverage.java | 6 +--
.../multiwindow/SimpleMovingAverageObject.java | 4 +-
.../lib/multiwindow/SortedMovingWindow.java | 10 ++---
.../lib/statistics/MedianOperator.java | 12 ++---
.../lib/statistics/ModeOperator.java | 6 +--
.../lib/statistics/StandardDeviation.java | 22 ++++-----
.../lib/statistics/WeightedMeanOperator.java | 16 +++----
.../lib/stream/AbstractAggregator.java | 16 +++----
.../lib/stream/ArrayListAggregator.java | 4 +-
.../datatorrent/lib/stream/ArrayListToItem.java | 6 +--
.../lib/stream/ConsolidatorKeyVal.java | 8 ++--
.../com/datatorrent/lib/stream/Counter.java | 4 +-
.../com/datatorrent/lib/stream/DevNull.java | 4 +-
.../datatorrent/lib/stream/DevNullCounter.java | 12 ++---
.../lib/stream/HashMapToKeyValPair.java | 4 +-
.../lib/stream/JsonByteArrayOperator.java | 4 +-
.../lib/stream/KeyValPairToHashMap.java | 4 +-
.../lib/stream/RoundRobinHashMap.java | 6 +--
.../lib/stream/StreamDuplicater.java | 6 +--
.../datatorrent/lib/stream/StreamMerger.java | 6 +--
.../streamquery/AbstractSqlStreamOperator.java | 22 ++++-----
.../lib/streamquery/DeleteOperator.java | 2 +-
.../lib/streamquery/DerbySqlStreamOperator.java | 4 +-
.../lib/streamquery/GroupByHavingOperator.java | 2 +-
.../lib/streamquery/InnerJoinOperator.java | 11 ++---
.../lib/streamquery/OrderByOperator.java | 43 ++++++++++++------
.../lib/streamquery/OrderByRule.java | 2 +-
.../lib/streamquery/OuterJoinOperator.java | 2 +-
.../lib/streamquery/SelectFunctionOperator.java | 4 +-
.../lib/streamquery/SelectOperator.java | 2 +-
.../lib/streamquery/SelectTopOperator.java | 10 ++---
.../lib/streamquery/UpdateOperator.java | 16 +++----
.../streamquery/condition/BetweenCondition.java | 16 +++----
.../condition/CompoundCondition.java | 12 ++---
.../lib/streamquery/condition/Condition.java | 6 +--
.../condition/EqualValueCondition.java | 6 +--
.../condition/HavingCompareValue.java | 8 ++--
.../streamquery/condition/HavingCondition.java | 8 ++--
.../lib/streamquery/condition/InCondition.java | 14 +++---
.../condition/JoinColumnEqualCondition.java | 12 ++---
.../streamquery/condition/LikeCondition.java | 12 ++---
.../streamquery/function/AverageFunction.java | 6 +--
.../lib/streamquery/function/CountFunction.java | 4 +-
.../streamquery/function/FirstLastFunction.java | 6 +--
.../lib/streamquery/function/FunctionIndex.java | 20 ++++-----
.../streamquery/function/MaxMinFunction.java | 4 +-
.../lib/streamquery/function/SumFunction.java | 2 +-
.../lib/streamquery/index/BinaryExpression.java | 10 ++---
.../lib/streamquery/index/ColumnIndex.java | 4 +-
.../lib/streamquery/index/Index.java | 4 +-
.../lib/streamquery/index/MidIndex.java | 8 ++--
.../lib/streamquery/index/NegateExpression.java | 2 +-
.../lib/streamquery/index/RoundDoubleIndex.java | 4 +-
.../lib/streamquery/index/StringCaseIndex.java | 8 ++--
.../lib/streamquery/index/StringLenIndex.java | 4 +-
.../lib/streamquery/index/SumExpression.java | 4 +-
.../lib/streamquery/index/UnaryExpression.java | 8 ++--
.../lib/testbench/ArrayListTestSink.java | 4 +-
.../lib/testbench/CollectorTestSink.java | 4 +-
.../lib/testbench/CompareFilterTuples.java | 28 ++++++------
.../testbench/CountAndLastTupleTestSink.java | 4 +-
.../lib/testbench/CountOccurance.java | 10 ++---
.../lib/testbench/CountTestSink.java | 2 +-
.../lib/testbench/EventClassifier.java | 4 +-
.../EventClassifierNumberToHashDouble.java | 4 +-
.../lib/testbench/EventGenerator.java | 12 ++---
.../lib/testbench/EventIncrementer.java | 10 ++---
.../lib/testbench/FilterClassifier.java | 2 +-
.../lib/testbench/FilteredEventClassifier.java | 2 +-
.../datatorrent/lib/testbench/HashTestSink.java | 2 +-
.../lib/testbench/HttpStatusFilter.java | 2 +-
.../datatorrent/lib/testbench/KeyValSum.java | 2 +-
.../lib/testbench/RandomEventGenerator.java | 4 +-
.../lib/testbench/RandomWordGenerator.java | 2 +-
.../datatorrent/lib/testbench/RedisSumOper.java | 4 +-
.../lib/testbench/SeedEventClassifier.java | 2 +-
.../lib/testbench/SeedEventGenerator.java | 2 +-
.../datatorrent/lib/testbench/SumTestSink.java | 2 +-
.../lib/testbench/ThroughputCounter.java | 2 +-
.../lib/testbench/TopOccurrence.java | 6 +--
.../datatorrent/lib/util/BaseLineTokenizer.java | 2 +-
.../datatorrent/lib/util/BaseMatchOperator.java | 13 ++++++
.../lib/util/BaseNumberValueOperator.java | 12 ++++-
.../util/DimensionTimeBucketSumOperator.java | 2 +-
188 files changed, 632 insertions(+), 576 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java
index 202bd98..8856ff1 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java
@@ -24,15 +24,15 @@ import org.apache.accumulo.core.data.Value;
import com.datatorrent.lib.db.AbstractStoreInputOperator;
/**
- * Base input adapter, which reads data from persistence database and writes into output port(s). Subclasses should provide the
- implementation of getting the tuples and scanner methods.
+ * Base input adapter, which reads data from persistence database and writes into output port(s). Subclasses should provide the
+ * implementation of getting the tuples and scanner methods.
*
* <p>
* This is an abstract class. Sub-classes need to implement {@link #getScanner()} and {@link #getTuple(Entry)}.
* </p>
* @displayName Abstract Accumulo Input
- * @category Store
- * @tags key value, input operator
+ * @category Input
+ * @tags key value, accumulo
* @since 1.0.4
*/
public abstract class AbstractAccumuloInputOperator<T> extends AbstractStoreInputOperator<T, AccumuloStore> {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java
index cee01cd..97e4192 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java
@@ -47,8 +47,8 @@ import com.google.common.collect.Lists;
* duplicates limiting it to the tuples that were processed in the window when
* the operator shutdown.
* @displayName Abstract Accumulo Output
- * @category Store
- * @tags output operator
+ * @category Output
+ * @tags accumulo, key value
* @param <T>
* The tuple type
* @since 1.0.4
@@ -94,12 +94,12 @@ public abstract class AbstractAccumuloOutputOperator<T> extends AbstractAggregat
tuples.clear();
}
/**
- *
+ *
* @param t
* @return Mutation
*/
public abstract Mutation operationMutation(T t);
-
+
@Override
public void setup(OperatorContext context)
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java
index afec90b..66a46b2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java
@@ -34,11 +34,11 @@ import com.datatorrent.netlet.util.DTThrowable;
import com.datatorrent.lib.db.Connectable;
/**
- * A {@link Connectable} for accumulo that implements Connectable interface.
+ * A {@link Connectable} for accumulo that implements Connectable interface.
* <p>
* @displayName Accumulo Store
- * @category Store
- * @tags store
+ * @category Output
+ * @tags key value, accumulo
* @param <T>
* @since 1.0.4
*/
@@ -65,7 +65,7 @@ public class AccumuloStore implements Connectable {
/**
* getter for Connector
- *
+ *
* @return Connector
*/
public Connector getConnector() {
@@ -74,7 +74,7 @@ public class AccumuloStore implements Connectable {
/**
* getter for TableName
- *
+ *
* @return TableName
*/
public String getTableName() {
@@ -83,7 +83,7 @@ public class AccumuloStore implements Connectable {
/**
* setter for TableName
- *
+ *
* @param tableName
*/
public void setTableName(String tableName) {
@@ -92,7 +92,7 @@ public class AccumuloStore implements Connectable {
/**
* getter for zookeeper host address
- *
+ *
* @return ZookeeperHost
*/
public String getZookeeperHost() {
@@ -101,7 +101,7 @@ public class AccumuloStore implements Connectable {
/**
* setter for zookeeper host address
- *
+ *
* @param zookeeperHost
*/
public void setZookeeperHost(String zookeeperHost) {
@@ -110,7 +110,7 @@ public class AccumuloStore implements Connectable {
/**
* getter for instanceName
- *
+ *
* @return instanceName
*/
public String getInstanceName() {
@@ -119,7 +119,7 @@ public class AccumuloStore implements Connectable {
/**
* setter for instanceName
- *
+ *
* @param instanceName
*/
public void setInstanceName(String instanceName) {
@@ -128,7 +128,7 @@ public class AccumuloStore implements Connectable {
/**
* setter for userName
- *
+ *
* @param userName
*/
public void setUserName(String userName) {
@@ -137,7 +137,7 @@ public class AccumuloStore implements Connectable {
/**
* setter for password
- *
+ *
* @param password
*/
public void setPassword(String password) {
@@ -145,7 +145,7 @@ public class AccumuloStore implements Connectable {
}
/**
* setter for memory limit
- *
+ *
* @param memoryLimit
*/
public void setMemoryLimit(long memoryLimit) {
@@ -153,7 +153,7 @@ public class AccumuloStore implements Connectable {
}
/**
* setter for number of writer threads
- *
+ *
* @param numThreads
*/
public void setNumThreads(int numThreads) {
@@ -162,7 +162,7 @@ public class AccumuloStore implements Connectable {
/**
* getter for BatchWriter
- *
+ *
* @return BatchWriter
*/
public BatchWriter getBatchwriter() {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java
index 475c044..1839072 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java
@@ -38,16 +38,16 @@ import com.datatorrent.netlet.util.DTThrowable;
import com.datatorrent.lib.db.TransactionableStore;
/**
- * Provides transactional support by implementing TransactionableStore abstract methods.
- *
+ * Provides transactional support by implementing TransactionableStore abstract methods.
+ *
* <p>
* Not intended for true transactional
* properties. It does not guarantee exactly once property.It only skips tuple
* processed in previous windows
- *
+ *
* @displayName Accumulo Window Store
- * @category Store
- * @tags store
+ * @category Output
+ * @tags accumulo, key value
* @since 1.0.4
*/
public class AccumuloWindowStore extends AccumuloStore implements TransactionableStore {
@@ -154,7 +154,7 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
Mutation mutation = new Mutation(rowBytes);
mutation.put(columnFamilyBytes, lastWindowColumnBytes, WindowIdBytes);
try {
- batchwriter.addMutation(mutation);
+ batchwriter.addMutation(mutation);
batchwriter.flush();
} catch (MutationsRejectedException e) {
logger.error("error getting committed window id", e);
@@ -168,7 +168,7 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
}
- public static byte[] toBytes(long l)
+ public static byte[] toBytes(long l)
{
ByteArrayOutputStream baos=new ByteArrayOutputStream(Long.SIZE/8);
DataOutputStream dos=new DataOutputStream(baos);
@@ -176,7 +176,7 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
try {
dos.writeLong(l);
result=baos.toByteArray();
- dos.close();
+ dos.close();
} catch (IOException e) {
logger.error("error converting to byte array");
DTThrowable.rethrow(e);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
index bb1bb86..f5cfb8a 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
@@ -27,13 +27,13 @@ import org.slf4j.LoggerFactory;
/**
* Base input adapter, which reads data from persistence database through its API and writes into output port(s).&nsbsp;
- * Subclasses should provide the implementation of getting the tuples and querying to retrieve data.
+ * Subclasses should provide the implementation of getting the tuples and querying to retrieve data.
* <p>
* This is an abstract class. Sub-classes need to implement {@link #queryToRetrieveData()} and {@link #getTuple(Record)}.
* </p>
* @displayName Abstract Aerospike Get
- * @category Database
- * @tags get, input operator
+ * @category Input
+ * @tags get
* @since 1.0.4
*/
public abstract class AbstractAerospikeGetOperator<T> extends AbstractStoreInputOperator<T, AerospikeStore> {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
index 28f65f4..2d556eb 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
@@ -27,11 +27,11 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
/**
* <p>
- * Generic base output adaptor which writes tuples as they come without providing any transactional support. Subclasses should provide implementation for getting updated bins.
+ * Generic base output adaptor which writes tuples as they come without providing any transactional support. Subclasses should provide implementation for getting updated bins.
* </p>
* @displayName Abstract Aerospike Non Transactional Put
- * @category Database
- * @tags output operator, put, non transactional
+ * @category Output
+ * @tags put, non transactional
* @param <T> type of tuple
* @since 1.0.4
*/
@@ -46,7 +46,7 @@ public abstract class AbstractAerospikeNonTransactionalPutOperator<T> extends Ab
/**
* Any concrete class needs to implement this method which using the input tuple, adds the
* modified bins to bins list and returns the key for that updated record.
- *
+ *
* @param tuple Tuple coming in from input port
* @param bins list of bins that would be updated for this tuple
* @return key for the row to be updated in the database
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
index 3221cbf..d594e79 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
@@ -36,8 +36,8 @@ import com.datatorrent.lib.db.AbstractBatchTransactionableStoreOutputOperator;
* only when all the updates are executed, the transaction is committed in the end window call.
* </p>
* @displayName Abstract Aerospike Transactional Put
- * @category Database
- * @tags output operator, put, transactional
+ * @category Output
+ * @tags put, transactional
* @param <T>type of tuple
* @since 1.0.4
*/
@@ -53,7 +53,7 @@ public abstract class AbstractAerospikeTransactionalPutOperator<T> extends Abstr
/**
* Any concrete class needs to implement this method which using the input tuple, adds the
* modified bins to bins list and returns the key for that updated record.
- *
+ *
* @param tuple Tuple coming in from input port
* @param bins list of bins that would be updated for this tuple
* @return key for the row to be updated in the database
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java
index cf0266a..7d37b6a 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java
@@ -24,10 +24,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A {@link Connectable} that uses aerospike to connect to stores and implements Connectable interface.
- *
+ * A {@link Connectable} that uses aerospike to connect to stores and implements Connectable interface.
+ *
* @displayName Aerospike Store
- * @category Database
+ * @category Output
* @tags store
* @since 1.0.4
*/
@@ -61,7 +61,7 @@ public class AerospikeStore implements Connectable {
/**
* Get the node.
- *
+ *
* @return The node
*/
@NotNull
@@ -80,7 +80,7 @@ public class AerospikeStore implements Connectable {
/**
* Get the client.
- *
+ *
* @return The client
*/
public AerospikeClient getClient() {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java
index 4d1c2c6..0645856 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java
@@ -29,9 +29,9 @@ import com.datatorrent.lib.db.TransactionableStore;
/**
* <p>Provides transaction support to the operators by implementing TransactionableStore abstract methods. </p>
- *
+ *
* @displayName Aerospike Transactional Store
- * @category Database
+ * @category Output
* @tags store, transactional
* @since 1.0.4
*/
@@ -170,10 +170,10 @@ public class AerospikeTransactionalStore extends AerospikeStore implements Trans
IndexTask task;
try {
- task = client.createIndex(null, namespace, metaSet,
+ task = client.createIndex(null, namespace, metaSet,
"operatorIdIndex", metaTableOperatorIdColumn, IndexType.NUMERIC);
task.waitTillComplete();
- task = client.createIndex(null, namespace, metaSet,
+ task = client.createIndex(null, namespace, metaSet,
"appIdIndex", metaTableAppIdColumn, IndexType.STRING);
task.waitTillComplete();
} catch (AerospikeException ex) {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java
index b189b62..57dfb37 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.conf.Configuration;
* An implementation of Streaming Application that reads from a local apache log file on the fly and dumps the parsed data to output.
* <p>
* @displayName Application Local Log
- * @category Database
+ * @category Output
* @tags reader, streaming
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java
index 9133f2f..0fca7b3 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.conf.Configuration;
*
* <p>
* @displayName Application Log Generator
- * @category Database
+ * @category Output
* @tags streaming
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java
index 993a5d5..751c7b3 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
*
* com.maxmind.geoip.LookupService.class
* @displayName Geo IP Extractor
- * @category Database
+ * @category Output
* @tags extraction, geo
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java
index 9095b57..11ded5a 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
* An implementation of InformationExtractor that extracts the time stamp in milliseconds from epoch from an arbitrary date string.
* <p>
* @displayName Timestamp Extractor
- * @category Database
+ * @category Output
* @tags timestamp, date, extraction
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java b/contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java
index f7a7d54..454c2d2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java
@@ -29,7 +29,7 @@ import net.sf.uadetector.service.UADetectorServiceFactory;
import net.sf.uadetector.UserAgentStringParser;
/**
- * An implementation of Information Extractor that extracts the browser and the OS from a user-agent string.
+ * An implementation of Information Extractor that extracts the browser and the OS from a user-agent string.
* <p>
* The user of this extractor needs to include the jars which contain these classes in DAGContext.LIBRARY_JARS
*
@@ -37,7 +37,7 @@ import net.sf.uadetector.UserAgentStringParser;
* net.sf.uadetector.service.UADetectorServiceFactory.class
* net.sf.qualitycheck.Check.class
* @displayName User Agent Extractor
- * @category Database
+ * @category Output
* @tags cache, extraction
* @since 0.9.4
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
index ee2d155..0c14a0e 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
@@ -36,8 +36,8 @@ import com.datatorrent.netlet.util.DTThrowable;
* </p>
* @param <T>
* @displayName Abstract Cassandra Input
- * @category Store
- * @tags input operator
+ * @category Input
+ * @tags cassandra
* @since 1.0.2
*/
public abstract class AbstractCassandraInputOperator<T> extends AbstractStoreInputOperator<T, CassandraStore> {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
index c1861a4..299d8ad 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
@@ -40,8 +40,8 @@ import com.datatorrent.lib.db.AbstractBatchTransactionableStoreOutputOperator;
* only when all the updates are executed, the transaction is committed in the end window call.
* </p>
* @displayName Abstract Cassandra Transactionable Output
- * @category Store
- * @tags output operator, batch, transactionable
+ * @category Output
+ * @tags cassandra, batch, transactionable
* @param <T>type of tuple</T>
* @since 1.0.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperatorPS.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperatorPS.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperatorPS.java
index 4b0242e..5587e66 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperatorPS.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperatorPS.java
@@ -41,8 +41,8 @@ import javax.annotation.Nonnull;
* only when all the updates are executed, the transaction is committed in the end window call.
* </p>
* @displayName Abstract Cassandra Transactionable Output With Prepared Statement
- * @category Store
- * @tags output operator, batch, transactionable
+ * @category Output
+ * @tags cassandra, batch, transactionable
* @param <T>type of tuple</T>
* @since 1.0.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java
index d2b874c..01aaa3b 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java
@@ -31,8 +31,8 @@ import com.datatorrent.lib.db.Connectable;
* A {@link Connectable} that uses cassandra to connect to stores and implements Connectable interface.
* <p>
* @displayName Cassandra Store
- * @category Store
- * @tags store
+ * @category Output
+ * @tags cassandra
* @since 1.0.2
*/
public class CassandraStore implements Connectable
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java
index 2740704..afcc026 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java
@@ -24,11 +24,11 @@ import com.datatorrent.lib.db.TransactionableStore;
/**
* <p>Provides transaction support to the operators by implementing TransactionableStore abstract methods. </p>
- *
+ *
* <p>
* @displayName Cassandra Transactional Store
- * @category Store
- * @tags store, transactional
+ * @category Output
+ * @tags cassandra, transactional
* @since 1.0.2
*/
public class CassandraTransactionalStore extends CassandraStore implements TransactionableStore {
@@ -137,7 +137,7 @@ public class CassandraTransactionalStore extends CassandraStore implements Trans
logger.debug(command);
lastWindowUpdateCommand = session.prepare(command);
- command = "DELETE FROM " + keyspace +"."+ metaTable + " where " + metaTableAppIdColumn + " = ? and " +
+ command = "DELETE FROM " + keyspace +"."+ metaTable + " where " + metaTableAppIdColumn + " = ? and " +
metaTableOperatorIdColumn + " = ?";
logger.debug(command);
lastWindowDeleteCommand = session.prepare(command);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java
index 8ca2feb..d4ad85b6 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java
@@ -50,8 +50,8 @@ import com.datatorrent.api.Context;
* Also the {@link #getViewQuery()} method should return the same view stored in CouchDb every time.<br/>
* </p>
* @displayName Abstract CouchDB Input
- * @category Database
- * @tags input operator
+ * @category Input
+ * @tags couchdb
* @param <T> Type of tuples which are generated</T>
* @since 0.3.5
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java
index 1e77b1e..7a59ec5 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java
@@ -24,7 +24,7 @@ import java.util.Map;
* An {@link AbstractStoreOutputOperator} saving tuples in the CouchDb.
* Sub-classes provide the implementation of parsing document id from the tuple and converting tuple to a map.
* @displayName Abstract CouchDB Output
- * @category Database
+ * @category Output
* @tags output operator
* @param <T> type of tuple </T>
* @since 0.3.5
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java
index 27475fd..f07b1c9 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java
@@ -29,7 +29,7 @@ import java.util.Map;
* It uses the emitTuples implementation of {@link AbstractCouchDBInputOperator} which emits the complete result
* of the ViewQuery every window cycle.
* @displayName Abstract Map Based Input
- * @category Database
+ * @category Input
* @tags input operator
* @since 0.3.5
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java
index 6d54c02..1d98fc0 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java
@@ -36,8 +36,8 @@ import com.datatorrent.lib.db.Connectable;
* <p>
* Operates in At-most once recovery mode.
* @displayName CouchDb Store
- * @category Database
- * @tags store
+ * @category Output
+ * @tags couchdb
* @since 0.3.5
*/
public class CouchDbStore implements Connectable
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
index 3fb92a2..78af5ea 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
@@ -34,12 +34,12 @@ import com.datatorrent.lib.db.AbstractStoreInputOperator;
* <br>
* Run time checks:<br>
* hostName port<br>
- *
+ *
* <b>Benchmarks</b>: <br>
- *
- * @displayName ElasticSearch input
- * @category Store
- * @tags input operator
+ *
+ * @displayName Elastic Search Input
+ * @category Input
+ * @tags elastic search
*
* @since 2.1.0
*/
@@ -49,7 +49,7 @@ public abstract class AbstractElasticSearchInputOperator<T, S extends ElasticSea
/**
* Initializing transient fields such as ElasticSearchConnectable, SearchRequestBuilder
- *
+ *
* @see com.datatorrent.lib.db.AbstractStoreInputOperator#setup(com.datatorrent.api.Context.OperatorContext)
*/
@Override
@@ -61,7 +61,7 @@ public abstract class AbstractElasticSearchInputOperator<T, S extends ElasticSea
/**
* Emit one tuple per {@code SearchHit} for given search query
- *
+ *
* @see com.datatorrent.api.InputOperator#emitTuples()
*/
@Override
@@ -78,7 +78,7 @@ public abstract class AbstractElasticSearchInputOperator<T, S extends ElasticSea
/**
* Converts SearchHit to Tuple
- *
+ *
* @param hit
* @return tuple constructed from <code>hit</code>
*/
@@ -88,7 +88,7 @@ public abstract class AbstractElasticSearchInputOperator<T, S extends ElasticSea
* Set {@link SearchRequestBuilder} properties according to search query requirements. Properties which do not change
* for each window can be set in {@code setup()}. Properties which may change for each window should be set in this
* function
- *
+ *
* @return {@link SearchRequestBuilder}
*/
protected abstract SearchRequestBuilder getSearchRequestBuilder();
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
index 640edaf..54a43af 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
@@ -30,8 +30,8 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
/**
* This is the base implementation for a non-transactional batch output operator for ElasticSearch.
- *
- *
+ *
+ *
* <br>
* Ports:<br>
* <b>Input</b>: Can have one input port <br>
@@ -39,7 +39,7 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
* <br>
* Properties:<br>
* <b>batchSize</b>:size for each batch insert, default value is 1000<br>
- *
+ *
* Compile time checks:<br>
* None<br>
* <br>
@@ -47,13 +47,14 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
* hostName<br>
* port<br>
* batchSize <br>
- *
+ *
* <b>Benchmarks</b>: <br>
* </p>
- *
- * @displayName ElasticSearch Output
- * @category Store
*
+ * @displayName Elastic Search Output
+ * @category Output
+ * @tags elastic search
+ *
* @since 2.1.0
*/
public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSearchConnectable> extends AbstractStoreOutputOperator<T, S>
@@ -65,7 +66,7 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
/**
* Initialize transient fields such as {@code tupleBatch}
- *
+ *
* @see com.datatorrent.lib.db.AbstractStoreOutputOperator#setup(com.datatorrent.api.Context.OperatorContext)
*/
@Override
@@ -78,7 +79,7 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
/**
* Adds tuple to the queue.
* Calls {@link #processBatch()} if queue is full
- *
+ *
* @see com.datatorrent.lib.db.AbstractStoreOutputOperator#processTuple(java.lang.Object)
*/
public void processTuple(T tuple)
@@ -116,11 +117,11 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
DTThrowable.rethrow(new Exception(bulkResponse.buildFailureMessage()));
}
}
-
+
/**
* Create {@link IndexRequestBuilder} for this tuple.
* It calls {@link #getId(T)}, {@link #getIndexName(T)}, {@link #getType(T)}.
- *
+ *
* @param tuple
* @return
*/
@@ -144,36 +145,36 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
/**
* Determine id for the given tuple.<br>
* If tuples do not have any field mapping to unique id then this function may return null. In this case
- * ElasticSearch will add auto-generated _id field to the document.
+ * ElasticSearch will add auto-generated _id field to the document.
* ElasticSearch will treat every tuple as fresh record.
- * If user requires {@code ProcessingMode.EXACTLY_ONCE} support; then user must
+ * If user requires {@code ProcessingMode.EXACTLY_ONCE} support; then user must
* implement {@link #getId(Object)} and make sure that distinct value is returned for each record.
- *
+ *
* @param tuple
* @return
*/
protected abstract String getId(T tuple);
-
+
/**
* Decides indexName under which this tuple gets stored.
- * Depending on scenario, user may decide index all tuples under same indexName
+ * Depending on scenario, user may decide index all tuples under same indexName
* (In this case user can return constant value for indexName).
- * Or user may have custom logic for deriving indexName
+ * Or user may have custom logic for deriving indexName
* @param tuple
* @return
*/
protected abstract String getIndexName(T tuple);
-
+
/**
* Decides type for given tuple.
- * Depending on scenario, user may decide index all tuples under same type
+ * Depending on scenario, user may decide index all tuples under same type
* (In this case user can return constant value for type).
- * Or user may have custom logic for deriving type.
+ * Or user may have custom logic for deriving type.
* @param tuple
* @return
*/
protected abstract String getType(T tuple);
-
+
/**
* @return the batchSize
*/
@@ -181,7 +182,7 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
{
return batchSize;
}
-
+
/**
* @param batchSize the batchSize to set
*/
@@ -189,5 +190,5 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
{
this.batchSize = batchSize;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
index ca57271..11c7742 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
@@ -28,7 +28,9 @@ import com.datatorrent.netlet.util.DTThrowable;
/**
* Percolate operator for ElasticSearch
- *
+ *
+ * @category Output
+ * @tags elastic search
* @since 2.1.0
*/
public class ElasticSearchPercolatorOperator extends BaseOperator
@@ -36,7 +38,7 @@ public class ElasticSearchPercolatorOperator extends BaseOperator
@NotNull
public String hostName;
public int port;
-
+
@NotNull
public String indexName;
@NotNull
@@ -49,7 +51,7 @@ public class ElasticSearchPercolatorOperator extends BaseOperator
/*
* (non-Javadoc)
- *
+ *
* @see com.datatorrent.api.DefaultInputPort#process(java.lang.Object)
*/
@Override
@@ -70,7 +72,7 @@ public class ElasticSearchPercolatorOperator extends BaseOperator
DTThrowable.rethrow(e);
}
}
-
+
/* (non-Javadoc)
* @see com.datatorrent.common.util.BaseOperator#teardown()
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java
index 610766c..f8e3e5b 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java
@@ -38,8 +38,8 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
* This class offers non-transactional append where the columns are append as
* the tuples come in without waiting for the end window
* @displayName Abstract HBase Append Output
- * @category Store
- * @tags output operator
+ * @category Output
+ * @tags hbase
* @param <T>
* The tuple type
* @since 1.0.2
@@ -69,7 +69,7 @@ extends AbstractStoreOutputOperator<T, HBaseStore> {
* Return the HBase Append metric to store the tuple. The implementor should
* return a HBase Append metric that specifies where and what to store for
* the tuple in the table.
- *
+ *
* @param t
* The tuple
* @return The HBase Append metric
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java
index e98a64e..ee44d99 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java
@@ -43,8 +43,8 @@ import com.datatorrent.netlet.util.DTThrowable;
* <br>
* This class offers non-transactional put where tuples are put as they come in.
* @displayName Abstract HBase Put Output
- * @category Store
- * @tags output operator, put
+ * @category Output
+ * @tags hbase, put
* @param <T>
* The tuple type
* @since 1.0.2
@@ -54,7 +54,7 @@ public abstract class AbstractHBasePutOutputOperator<T> extends AbstractStoreOut
public static final int DEFAULT_BATCH_SIZE = 1000;
private int batchSize = DEFAULT_BATCH_SIZE;
protected int unCommittedSize = 0;
-
+
public AbstractHBasePutOutputOperator() {
store = new HBaseStore();
}
@@ -98,7 +98,7 @@ public abstract class AbstractHBasePutOutputOperator<T> extends AbstractStoreOut
DTThrowable.rethrow(e);
}
}
-
+
public abstract Put operationPut(T t);
/**
@@ -118,5 +118,5 @@ public abstract class AbstractHBasePutOutputOperator<T> extends AbstractStoreOut
this.batchSize = batchSize;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
index c9f4217..ca7ff96 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
@@ -54,8 +54,8 @@ import com.datatorrent.lib.db.AbstractAggregateTransactionableStoreOutputOperato
* It supports atleast once and atmost once processing modes.
* Exactly once is not supported
* @displayName Abstract HBase Window Append Output
- * @category Store
- * @tags output operator, append, transactionable, batch
+ * @category Output
+ * @tags hbase, append, transactionable, batch
* @param <T>
* The tuple type
* @since 1.0.2
@@ -110,7 +110,7 @@ public abstract class AbstractHBaseWindowAppendOutputOperator<T> extends Abstrac
* Return the HBase Append metric to store the tuple. The implementor should
* return a HBase Append metric that specifies where and what to store for
* the tuple in the table.
- *
+ *
* @param t
* The tuple
* @return The HBase Append metric
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
index f117168..5c6f6ce 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
@@ -54,8 +54,8 @@ import com.datatorrent.lib.db.AbstractAggregateTransactionableStoreOutputOperato
* It supports atleast once and atmost once processing modes.
* Exactly once is not supported
* @displayName Abstract HBase Window Put Output
- * @category Store
- * @tags output operator, put, transactionable, batch
+ * @category Output
+ * @tags hbase, put, transactionable, batch
* @param <T>
* The tuple type
* @since 1.0.2
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java
index 48819b7..03ab6f2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java
@@ -34,11 +34,11 @@ import com.datatorrent.netlet.util.DTThrowable;
import com.datatorrent.lib.util.ReusableStringReader;
/**
- * Takes a configuration string which tells us about the position of the row, or column. The incoming tuples are inserted accordingly.
+ * Takes a configuration string which tells us about the position of the row, or column. The incoming tuples are inserted accordingly.
* <p>
* @displayName HBase Csv Mapping Put
- * @category Store
- * @tags output operator, put, String
+ * @category Output
+ * @tags hbase, csv, put, String
* @since 1.0.4
*/
public class HBaseCsvMappingPutOperator extends AbstractHBaseWindowPutOutputOperator<String> {
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
index 795548e..68be0b1 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
@@ -31,8 +31,8 @@ import org.apache.hadoop.hbase.client.Result;
*
* <br>
* @displayName HBase Get
- * @category Store
- * @tags input operator, get
+ * @category Input
+ * @tags hbase, get
* @param <T> The tuple type
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
index 3c25629..af179cf 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
@@ -25,8 +25,8 @@ import java.io.IOException;
* <p>
* <br>
* @displayName HBase Input
- * @category Store
- * @tags input operator
+ * @category Input
+ * @tags hbase
* @param <T> The tuple type
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java
index 798a1ab..4165fb3 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java
@@ -39,14 +39,14 @@ import java.util.Map;
* are mapped to corresponding rows,column families and columns using a property
* file and inserted into hbase Example: input string will be of the form
* name="xyz", st="patrickhenry" ,ct="fremont", sa="california", the properties will contain
- * properties of form name=row, sa=address.street, ct=address.city, sa=address.state.
+ * properties of form name=row, sa=address.street, ct=address.city, sa=address.state.
* With the above mapping a row xyz is created. The value patrickhenry is inserted into
* columnfamily address and column street of row xyz. Other values are inserted
* similarly.
- *
+ *
* @displayName HBase Name Value Csv Put
- * @category Store
- * @tags output operator, put
+ * @category Output
+ * @tags csv, hbase, put
* @since 1.0.2
*/
public class HBaseNameValueCsvPutOperator extends AbstractHBaseWindowPutOutputOperator<String> {
@@ -115,7 +115,7 @@ public class HBaseNameValueCsvPutOperator extends AbstractHBaseWindowPutOutputOp
} catch (IOException e) {
logger.error("Cannot read the property string", e);
DTThrowable.rethrow(e);
- }
+ }
for (String pair : csvLineList) {
String key = pair.substring(0, pair.indexOf('='));
String value = pair.substring(pair.indexOf('=') + 1);
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java
index 2dfdaf6..5634cc4 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java
@@ -26,11 +26,11 @@ import org.apache.hadoop.hbase.client.HTable;
* <br>
* The HBase operators extend this class. The base class contains the HBase properties and also sets up
* the configuration to be used by the HBase operators.<br>
- *
+ *
* <br>
* @displayName HBase Operator Base
- * @category Store
- * @tags base, properties
+ * @category Output
+ * @tags hbase, base, properties
* @since 0.3.2
*/
public class HBaseOperatorBase
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java
index c5647ab..b93ca19 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java
@@ -33,8 +33,8 @@ import org.apache.hadoop.hbase.client.ResultScanner;
*
* <br>
* @displayName HBase Scan
- * @category Store
- * @tags scan, input operator
+ * @category Output
+ * @tags hbase, scan, input operator
* @since 0.3.2
*/
public abstract class HBaseScanOperator<T> extends HBaseInputOperator<T>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java
index d06256f..85542d0 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java
@@ -27,23 +27,23 @@ import org.apache.hadoop.security.UserGroupInformation;
import com.datatorrent.lib.db.Connectable;
/**
- * A {@link Connectable} that uses HBase to connect to stores and implements Connectable interface.
+ * A {@link Connectable} that uses HBase to connect to stores and implements Connectable interface.
* <p>
* @displayName HBase Store
- * @category Store
- * @tags store
+ * @category Output
+ * @tags store, hbase
* @since 1.0.2
*/
public class HBaseStore implements Connectable {
public static final String USER_NAME_SPECIFIER = "%USER_NAME%";
-
+
private static final Logger logger = LoggerFactory.getLogger(HBaseStore.class);
-
+
private String zookeeperQuorum;
private int zookeeperClientPort;
protected String tableName;
-
+
protected String principal;
protected String keytabPath;
// Default interval 30 min
@@ -55,7 +55,7 @@ public class HBaseStore implements Connectable {
/**
* Get the zookeeper quorum location.
- *
+ *
* @return The zookeeper quorum location
*/
public String getZookeeperQuorum() {
@@ -64,7 +64,7 @@ public class HBaseStore implements Connectable {
/**
* Set the zookeeper quorum location.
- *
+ *
* @param zookeeperQuorum
* The zookeeper quorum location
*/
@@ -74,7 +74,7 @@ public class HBaseStore implements Connectable {
/**
* Get the zookeeper client port.
- *
+ *
* @return The zookeeper client port
*/
public int getZookeeperClientPort() {
@@ -83,7 +83,7 @@ public class HBaseStore implements Connectable {
/**
* Set the zookeeper client port.
- *
+ *
* @param zookeeperClientPort
* The zookeeper client port
*/
@@ -93,7 +93,7 @@ public class HBaseStore implements Connectable {
/**
* Get the HBase table name.
- *
+ *
* @return The HBase table name
*/
public String getTableName() {
@@ -102,7 +102,7 @@ public class HBaseStore implements Connectable {
/**
* Set the HBase table name.
- *
+ *
* @param tableName
* The HBase table name
*/
@@ -175,7 +175,7 @@ public class HBaseStore implements Connectable {
/**
* Get the HBase table .
- *
+ *
* @return The HBase table
* @omitFromUI
*/
@@ -183,10 +183,10 @@ public class HBaseStore implements Connectable {
return table;
}
-
+
/**
* Get the configuration.
- *
+ *
* @return The configuration
*/
public Configuration getConfiguration() {
@@ -195,7 +195,7 @@ public class HBaseStore implements Connectable {
/**
* Set the configuration.
- *
+ *
* @param configuration
* The configuration
*/
@@ -250,11 +250,11 @@ public class HBaseStore implements Connectable {
table.setAutoFlushTo(false);
}
-
+
private String evaluateProperty(String property) throws IOException
{
if (property.contains(USER_NAME_SPECIFIER)) {
- property = property.replaceAll(USER_NAME_SPECIFIER, UserGroupInformation.getLoginUser().getShortUserName());
+ property = property.replaceAll(USER_NAME_SPECIFIER, UserGroupInformation.getLoginUser().getShortUserName());
}
return property;
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java
index f9b436f..eeb9f5c 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java
@@ -34,7 +34,7 @@ import java.io.InterruptedIOException;
* HBase in case the operator is restarted from an earlier checkpoint. It only tries to minimize the number of
* duplicates limiting it to the tuples that were processed in the window when the operator shutdown.
* @displayName HBase Window Store
- * @category Store
+ * @category Output
* @tags store, transactional
* @since 1.0.2
*/
@@ -66,7 +66,7 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
/**
* Get the row name in the table.
- *
+ *
* @return The row name
*/
public String getRowName() {
@@ -75,7 +75,7 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
/**
* Set the row name in the table.
- *
+ *
* @param rowName
* The row name
*/
@@ -86,7 +86,7 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
/**
* Get the column family name in the table.
- *
+ *
* @return The column family name
*/
public String getColumnFamilyName() {
@@ -95,7 +95,7 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
/**
* Set the column family name in the table.
- *
+ *
* @param columnFamilyName
* The column family name
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
index da67011..0fc891f 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
@@ -28,10 +28,13 @@ import java.sql.Timestamp;
import java.util.ArrayList;
import java.sql.Date;
-/*
+/**
* An Implementation of AbstractFSRollingOutputOperator which takes any POJO as input, serializes the POJO as Hive delimiter separated values
* which are written in text files to hdfs, and are inserted into hive on committed window callback.This operator can handle outputting to multiple files when the output file depends on the tuple.
- * @displayName: FSPojoToHiveOperator
+ *
+ * @displayName: FS To Hive Operator
+ * @category Output
+ * @tags fs, hive, database
*/
public class FSPojoToHiveOperator extends AbstractFSRollingOutputOperator<Object>
{
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java
index 4322c5d..932541d 100755
--- a/contrib/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java
@@ -43,6 +43,9 @@ import org.apache.hadoop.fs.Path;
* This is a fault tolerant implementation of HiveOperator which assumes that load operation
* is an atomic operation in Hive.
*
+ * @category Output
+ * @tags database, sql, hive
+ *
* @since 2.1.0
*/
@OperatorAnnotation(checkpointableWithinAppWindow = false)
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
index 347d3b1..4e937a1 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
@@ -1,5 +1,5 @@
/**
- *
+ *
* Copyright (c) 2015 DataTorrent, Inc. ALL Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,9 +20,9 @@ package com.datatorrent.contrib.kinesis;
import com.datatorrent.common.util.Pair;
/**
- *
+ *
* @displayName Kinesis Put Output
- * @category Database
+ * @category Output
* @tags Kinesis put, output operator, ByteArray
*/
public class KinesisByteArrayOutputOperator extends AbstractKinesisOutputOperator<byte[], Pair<String, byte[]>>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java
index 15620b4..1332fe6 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java
@@ -19,7 +19,8 @@ import com.datatorrent.common.util.Pair;
/**
* KinesisStringOutputOperator
- *
+ * @category Output
+ * @tags kinesis
* @since 2.0.0
*/
public class KinesisStringOutputOperator extends AbstractKinesisOutputOperator<String, String>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java
index d4a8b5f..cb16f33 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java
@@ -22,8 +22,8 @@ import com.datatorrent.lib.db.AbstractKeyValueStoreInputOperator;
* A concrete operator should be created from this skeleton implementation.
* <p></p>
* @displayName Abstract Memcache Input
- * @category Store
- * @tags output operator, key value
+ * @category Input
+ * @tags memcache, key value
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java
index 588dfa2..8daa7df 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java
@@ -22,8 +22,8 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
* A concrete operator should be created from this skeleton implementation.
* <p></p>
* @displayName Abstract Memcache Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags memcache, key value
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
index a5d7f79..6e3bd60 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
@@ -22,8 +22,8 @@ import com.datatorrent.lib.db.AbstractKeyValueStoreInputOperator;
* A concrete operator should be created from this skeleton implementation.
* <p></p>
* @displayName Abstract Memcache Input
- * @category Store
- * @tags input operator, key value
+ * @category Input
+ * @tags memcache, key value
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
index 56730c5..523b9af 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
@@ -22,8 +22,8 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
* A concrete operator should be created from this skeleton implementation.
* <p></p>
* @displayName Abstract Memcache Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags memcache, key value
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java
index c0ed0b6..f8b6014 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java
@@ -43,8 +43,8 @@ import org.slf4j.LoggerFactory;
* <br>
* </p>
* @displayName MongoDB Array List Output
- * @category Database
- * @tags output operator
+ * @category Output
+ * @tags mongodb
*
* @since 0.3.2
*/
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java
index 928aaa2..4501dc2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java
@@ -41,8 +41,8 @@ import java.util.*;
* <br>
* </p>
* @displayName MongoDB Hash Map Output
- * @category Database
- * @tags output operator
+ * @category Output
+ * @tags mongodb
* @since 0.3.2
*/
public class MongoDBHashMapOutputOperator<T> extends MongoDBOutputOperator<HashMap<String, T>>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
index c4a0b53..7427627 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
@@ -52,8 +52,8 @@ import org.slf4j.LoggerFactory;
* <br>
* </p>
* @displayName MongoDB Input
- * @category Database
- * @tags input operator
+ * @category Input
+ * @tags mongodb
* @since 0.3.2
*/
public abstract class MongoDBInputOperator<T> extends MongoDBConnectable implements InputOperator, ActivationListener<OperatorContext>
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
index b2f074e..1dc13d2 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
@@ -73,8 +73,8 @@ import org.slf4j.LoggerFactory;
* <br>
* </p>
* @displayName MongoDB Output
- * @category Database
- * @tags output operator
+ * @category Output
+ * @tags mongodb
* @since 0.3.2
*/
public abstract class MongoDBOutputOperator<T> extends MongoDBConnectable implements Operator
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java
index 18af9a0..040a83f 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java
@@ -21,8 +21,8 @@ import com.datatorrent.lib.db.AbstractAggregateTransactionableKeyValueStoreOutpu
* This is the base implementation of a Redis aggregate output operator.
* <p></p>
* @displayName Abstract Redis Aggregate Output
- * @category Store
- * @tags output operator, key value, aggregate
+ * @category Output
+ * @tags redis, key value, aggregate
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
index 901facb..ff7a9a5 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
@@ -21,8 +21,8 @@ import com.datatorrent.lib.db.AbstractKeyValueStoreInputOperator;
* This is the base implementation of a Redis input operator.
* <p></p>
* @displayName Abstract Redis Input
- * @category Store
- * @tags input operator, key value
+ * @category Input
+ * @tags redis, key value
*
* @param <T> The tuple type.
* @since 0.9.3
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java
index c6c0dcc..9a345f8 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java
@@ -28,8 +28,8 @@ import java.util.Map;
* </p>
*
* @displayName Redis Key Val Pair Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags redis, key value
*
* @param <K> The key type.
* @param <V> The value type.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java
index 0ef55f1..84baab7 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java
@@ -27,8 +27,8 @@ import java.util.Map;
* </p>
*
* @displayName Redis Map Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags redis, key value
*
* @param <K> The key type.
* @param <V> The value type.
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
index 6c9966e..643377e 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
@@ -26,8 +26,8 @@ import java.util.Map;
* <p></p>
*
* @displayName Redis Number Summation Key Val Pair Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags redis, key value
*
* @param <K> The key type
* @param <V> The value type
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java
index 70b11d5..d26a026 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java
@@ -24,8 +24,8 @@ import java.util.Map;
* Otherwise, it will increment the value as is.
* <p></p>
* @displayName Redis Number Summation Key Val Pair Output
- * @category Store
- * @tags output operator, key value
+ * @category Output
+ * @tags redis, key value
*
* @param <K> The key type
* @param <V> The value type
http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
----------------------------------------------------------------------
diff --git a/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
index 6e36422..5ba6d37 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
@@ -39,8 +39,8 @@ import com.datatorrent.lib.db.AbstractStoreInputOperator;
* This is an abstract class. Sub-classes need to implement {@link #queryToRetrieveData()} and {@link #getTuple(String)}.
* </p>
* @displayName Abstract Splunk Input
- * @category Database
- * @tags input operator
+ * @category Input
+ * @tags splunk
*
* @since 1.0.4
*/