Repository: incubator-apex-malhar Updated Branches: refs/heads/master ff31e3cb0 -> 0690700b3
Fixed the category, display name, and tags for POJO operators. 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/56de133e Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/56de133e Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/56de133e Branch: refs/heads/master Commit: 56de133ed8b4261da26ad39bd7c81f4551b3857c Parents: 47ef1c8 Author: Timothy Farkas <[email protected]> Authored: Mon Jul 27 16:17:46 2015 -0700 Committer: thomas <[email protected]> Committed: Mon Jul 27 19:36:22 2015 -0700 ---------------------------------------------------------------------- .../AerospikePOJONonTransactionalPutOperator.java | 7 ++++--- .../AerospikePOJOTransactionalPutOperator.java | 6 +++--- .../cassandra/CassandraPOJOInputOperator.java | 4 ++-- .../cassandra/CassandraPOJOOutputOperator.java | 2 +- .../couchbase/CouchBasePOJOInputOperator.java | 4 ++-- .../couchbase/CouchbasePOJOSetOperator.java | 6 +++++- .../contrib/couchdb/CouchDBPOJOInputOperator.java | 3 +++ .../couchdb/CouchDBPOJOOutputOperator.java | 6 +++--- .../contrib/hbase/HBasePOJOInputOperator.java | 17 +++++++++++------ .../contrib/hbase/HBasePOJOPutOperator.java | 11 +++++------ .../memcache/MemcachePOJOOutputOperator.java | 18 +++++++++--------- .../contrib/memsql/MemsqlPOJOInputOperator.java | 4 ++-- .../contrib/memsql/MemsqlPOJOOutputOperator.java | 5 +++++ .../mongodb/MongoDBPOJOOutputOperator.java | 6 +++--- .../snapshot/AppDataSnapshotServerPOJO.java | 2 +- .../lib/db/jdbc/JdbcPOJOOutputOperator.java | 2 +- 16 files changed, 60 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java index 9fb7bd1..4b0a1f3 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java @@ -34,9 +34,10 @@ import com.datatorrent.lib.util.PojoUtils.Getter; * A generic implementation of {@link AbstractAerospikeNonTransactionalPutOperator} which can * take a POJO. * </p> - * @displayName Aerospike Non-Transactional Put - * @category Database - * @tags output operator, put, non-transactional, POJO + * + * @displayName Aerospike Non-Transactional Put Operator + * @category Output + * @tags database, nosql, pojo, aerospike * @since 2.1.0 */ public class AerospikePOJONonTransactionalPutOperator extends AbstractAerospikeNonTransactionalPutOperator<Object> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java index 0fd9620..057d7b0 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java @@ -35,9 +35,9 @@ import com.datatorrent.lib.util.PojoUtils.Getter; * {@link com.datatorrent.contrib.aerospike.AbstractAerospikeTransactionalPutOperator} which can * take a POJO. * </p> - * @displayName Aerospike Transactional Put - * @category Database - * @tags output operator, put, transactional, POJO + * @displayName Aerospike Transactional Put Operator + * @category Output + * @tags data, nosql, pojo, aerospike * @since 2.1.0 */ public class AerospikePOJOTransactionalPutOperator http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java index b6ecbe4..37c54d8 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java @@ -43,9 +43,9 @@ import com.datatorrent.api.Context.OperatorContext; * and %l for limit. The start value is continuously updated with the value of a primary key column of the last row from * the result of the previous run of the query. The primary key column is also identified by the user using a property. * - * @displayName Cassandra POJO Input Operator + * @displayName Cassandra Input Operator * @category Input - * @tags input operator + * @tags database, nosql, pojo, cassandra */ public class CassandraPOJOInputOperator extends AbstractCassandraInputOperator<Object> { http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java index ab337dc..2b9d612 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; * * @displayName Cassandra Output Operator * @category Output - * @tags output operator + * @tags database, nosql, pojo, cassandra * @since 2.1.0 */ public class CassandraPOJOOutputOperator extends AbstractCassandraTransactionableOutputOperatorPS<Object> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java index 3f57b4d..305546b 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java @@ -43,9 +43,9 @@ import com.datatorrent.api.Context.OperatorContext; * emit(doc._id, [doc.username, doc.first_name, doc.last_name, doc.last_login]); * } * - * @displayName Couchbase POJO Input Operator + * @displayName Couchbase Input Operator * @category Input - * @tags input operator + * @tags database, nosql, pojo, couchbase */ public class CouchBasePOJOInputOperator extends AbstractStoreInputOperator<Object, CouchBaseStore> { http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java index 89909b8..6809dd8 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java @@ -25,9 +25,13 @@ import org.slf4j.LoggerFactory; import com.datatorrent.lib.util.PojoUtils; import com.datatorrent.lib.util.PojoUtils.Getter; -/* +/** * An implementation of Couchbase Output Operator which takes a POJO,serializes it into key,value * pair and then writes to couchbase. + * + * @displayName Couchbase Output Operator + * @category Output + * @tags database, nosql, pojo, couchbase */ public class CouchbasePOJOSetOperator extends AbstractCouchBaseSetOperator<Object> { http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java index 9e9153d..c53b8ad 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java @@ -47,6 +47,9 @@ import com.datatorrent.api.Context.OperatorContext; * emit(doc._id, doc); * } * + * @displayName CouchDb Input Operator + * @category Input + * @tags database, nosql, pojo, couchdb */ public class CouchDBPOJOInputOperator extends AbstractCouchDBInputOperator<Object> { http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java index f949861..afa500a 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java @@ -23,9 +23,9 @@ import com.datatorrent.lib.util.PojoUtils.Getter; /** * Implementation of {@link AbstractCouchDBOutputOperator} that saves a POJO in the couch database. <br/> * <p> - * @displayName POJO Based CouchDb Output Operator - * @category Database - * @tags output operator + * @displayName CouchDb Output Operator + * @category Output + * @tags database, nosql, pojo, couchdb * @since 0.3.5 */ public class CouchDBPOJOOutputOperator extends AbstractCouchDBOutputOperator<Object> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java index 8de1cca..f4696d5 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java @@ -18,6 +18,11 @@ import com.datatorrent.lib.util.TableInfo; import com.datatorrent.api.Context.OperatorContext; +/** + * @displayName HBase Input Operator + * @category Input + * @tags database, nosql, pojo, hbase + */ public class HBasePOJOInputOperator extends HBaseInputOperator<Object> { private TableInfo<HBaseFieldInfo> tableInfo; @@ -25,12 +30,12 @@ public class HBasePOJOInputOperator extends HBaseInputOperator<Object> private String pojoTypeName; private String startRow; private String lastReadRow; - + protected transient Class pojoType; private transient Setter<Object, String> rowSetter; protected transient FieldValueGenerator<HBaseFieldInfo> fieldValueGenerator; protected transient BytesValueConverter valueConverter; - + public static class BytesValueConverter implements ValueConverter<HBaseFieldInfo> { @Override @@ -39,7 +44,7 @@ public class HBasePOJOInputOperator extends HBaseInputOperator<Object> return fieldInfo.toValue( (byte[])value ); } } - + @Override public void setup(OperatorContext context) { @@ -91,7 +96,7 @@ public class HBasePOJOInputOperator extends HBaseInputOperator<Object> Object instance = pojoType.newInstance(); rowSetter.set(instance, readRow); - + List<Cell> cells = result.listCells(); for (Cell cell : cells) { @@ -99,7 +104,7 @@ public class HBasePOJOInputOperator extends HBaseInputOperator<Object> byte[] value = CellUtil.cloneValue(cell); fieldValueGenerator.setColumnValue( instance, columnName, value, valueConverter ); } - + outputPort.emit(instance); lastReadRow = readRow; } @@ -109,7 +114,7 @@ public class HBasePOJOInputOperator extends HBaseInputOperator<Object> } } - + protected Scan nextScan() { if(lastReadRow==null && startRow==null ) http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java index 58166c8..8055456 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java @@ -27,10 +27,9 @@ import com.datatorrent.lib.util.PojoUtils.Getter; import com.datatorrent.lib.util.TableInfo; /** - * - * @displayName HBase Put Output - * @category Database - * @tags hbase put, output operator, Pojo + * @displayName HBase Output Operator + * @category Output + * @tags database, nosql, pojo, hbase */ public class HBasePOJOPutOperator extends AbstractHBasePutOutputOperator<Object> { @@ -42,7 +41,7 @@ public class HBasePOJOPutOperator extends AbstractHBasePutOutputOperator<Object> private transient Getter<Object, String> rowGetter; private transient HBaseFieldValueHandler valueHandler = new HBaseFieldValueHandler(); - + @Override public Put operationPut(Object obj) { @@ -77,7 +76,7 @@ public class HBasePOJOPutOperator extends AbstractHBasePutOutputOperator<Object> this.tableInfo = tableInfo; } - + public static class HBaseFieldValueHandler implements FieldValueHandler<HBaseFieldInfo> { public Put put; http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java index 1b67c26..6e2c014 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java @@ -24,10 +24,10 @@ import com.datatorrent.lib.util.PojoUtils.Getter; import com.datatorrent.lib.util.TableInfo; /** - * + * * @displayName Memcache Output Operator - * @category Database - * @tags Memcache, output operator, Pojo + * @category Output + * @tags pojo, memcache */ public class MemcachePOJOOutputOperator extends AbstractMemcacheOutputOperator< Object > { @@ -35,7 +35,7 @@ public class MemcachePOJOOutputOperator extends AbstractMemcacheOutputOperator< private TableInfo<FieldInfo> tableInfo; private transient FieldValueGenerator<FieldInfo> fieldValueGenerator; private transient Getter<Object, String> rowGetter; - + @Override public void processTuple(Object tuple) { @@ -51,15 +51,15 @@ public class MemcachePOJOOutputOperator extends AbstractMemcacheOutputOperator< if (fieldValueGenerator == null) { fieldValueGenerator = FieldValueGenerator.getFieldValueGenerator(tuple.getClass(), fieldsInfo); } - + value = fieldValueGenerator.getFieldsValueAsMap(tuple); } - + getStore().put( rowGetter.get(tuple), value); } /** - * + * * the information to convert pojo */ public TableInfo<FieldInfo> getTableInfo() @@ -68,12 +68,12 @@ public class MemcachePOJOOutputOperator extends AbstractMemcacheOutputOperator< } /** - * + * * the information to convert pojo */ public void setTableInfo(TableInfo<FieldInfo> tableInfo) { this.tableInfo = tableInfo; } - + } http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java index 3beb677..64d0227 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java @@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory; * and %l for limit. The start value is continuously updated with the value of a primary key column of the last row from * the result of the previous run of the query. The primary key column is also identified by the user using a property. * - * @displayName Memsql POJO Input Operator + * @displayName Memsql Input Operator * @category Input - * @tags input operator + * @tags database, sql, pojo, memsql */ public class MemsqlPOJOInputOperator extends AbstractMemsqlInputOperator<Object> { http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java index b83a811..bba60f7 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java @@ -36,6 +36,11 @@ import org.slf4j.LoggerFactory; * A generic implementation of AbstractMemsqlOutputOperator which can take in a POJO. * * @since 2.1.0 + * + * @displayName Memsql Output Operator + * @category Output + * @tags database, sql, pojo, memsql + * */ public class MemsqlPOJOOutputOperator extends AbstractMemsqlOutputOperator<Object> { http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java ---------------------------------------------------------------------- diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java index 304a6ea..285ed90 100644 --- a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java +++ b/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java @@ -26,9 +26,9 @@ import javax.validation.constraints.NotNull; /** * Implementation of {@link MongoDBOutputOperator} that saves a POJO in the mongodb database. <br/> * <p> - * @displayName POJO Based MongoDb Output Operator - * @category Database - * @tags output operator + * @displayName MongoDb Output Operator + * @category Output + * @tags database, nosql, pojo, mongodb * @since 0.3.5 */ public class MongoDBPOJOOutputOperator extends MongoDBOutputOperator<Object> http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java index 32d7cb8..bfd578a 100644 --- a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java +++ b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java @@ -28,7 +28,7 @@ import com.datatorrent.lib.appdata.gpo.GPOUtils; /** * This operator accepts a list of POJOs, and serves the data under the {@link SnapshotSchema}. * Each POJO represents a row in the table, and the full list of POJOs represents a table. - * @displayName App Data Snapshot POJO Server + * @displayName App Data Snapshot Server * @category App Data * @tags appdata, snapshot, pojo */ http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/56de133e/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java index 45e6671..4da989d 100644 --- a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java +++ b/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOOutputOperator.java @@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory; * * @displayName Jdbc Output Operator * @category Output - * @tags output operator,transactional, POJO + * @tags database, sql, pojo, jdbc * @since 2.1.0 */ public class JdbcPOJOOutputOperator extends AbstractJdbcTransactionableOutputOperator<Object>
