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:01 UTC

[13/50] [abbrv] incubator-apex-malhar git commit: Fix category, tags, properties, and display names for app builder.

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java b/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java
index 0c2bd69..5aea7e1 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/OrderByRule.java
@@ -25,7 +25,7 @@ import java.util.TreeMap;
  * <b>Properties : </b> <br>
  * <b> columnName : </b> Name of column for ordering tuples. <br>
  * @displayName OrderBy Rule
- * @category Streamquery
+ * @category Stream Manipulators
  * @tags orderby, sort, comparison
  * @since 0.3.3
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/OuterJoinOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/OuterJoinOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/OuterJoinOperator.java
index 07f95f8..4759f31 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/OuterJoinOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/OuterJoinOperator.java
@@ -25,7 +25,7 @@ package com.datatorrent.lib.streamquery;
  * <b> isLeftJoin : </b> Left join flag. <br>
  * <b> isFullJoin : </b> Full join flag. <br>
  * @displayName Outer Join
- * @category Streamquery
+ * @category Stream Manipulators
  * @tags sql, outer join operator
  * @since 0.3.4
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/SelectFunctionOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/SelectFunctionOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/SelectFunctionOperator.java
index 39d4133..bfce750 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/SelectFunctionOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/SelectFunctionOperator.java
@@ -39,7 +39,7 @@ import com.datatorrent.lib.streamquery.function.FunctionIndex;
  * <b> Properties : </b> <br>
  * <b> functions : </b> Sql function for rows. <br>
  * @displayName Select Function
- * @category Streamquery
+ * @category Stream Manipulators
  * @tags sql top, sql limit, sql select operator
  * @since 0.3.4
  */
@@ -50,7 +50,7 @@ public class SelectFunctionOperator implements Operator
    * array of rows.
    */
   private ArrayList<Map<String, Object>> rows;
-  
+
   /**
    * Aggregate function for rows.
    */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/SelectOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/SelectOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/SelectOperator.java
index 9fcabc0..41fe364 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/SelectOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/SelectOperator.java
@@ -44,7 +44,7 @@ import com.datatorrent.lib.streamquery.index.Index;
  * <b> columns : </b> Column names/aggregate functions for select. <br>
  * <br>
  * @displayName Select
- * @category Streamquery
+ * @category Stream Manipulators
  * @tags sql select operator, index, sql condition
  * @since 0.3.3
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/SelectTopOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/SelectTopOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/SelectTopOperator.java
index 9b97edf..a03e7dd 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/SelectTopOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/SelectTopOperator.java
@@ -42,7 +42,7 @@ import com.datatorrent.api.Operator;
  * <b> isPercentage : </b> top values count is percentage flag.
  * <br>
  * @displayName Select Top
- * @category Streamquery
+ * @category Stream Manipulators
  * @tags sql select, sql top operator
  *  @since 0.3.4
  */
@@ -51,7 +51,7 @@ public class SelectTopOperator implements Operator
   private ArrayList<Map<String, Object>> list;
   private int topValue = 1;
   private boolean isPercentage = false;
-  
+
   /**
    * Input port that takes a map of &lt;string,object&gt;.
    */
@@ -62,19 +62,19 @@ public class SelectTopOperator implements Operator
       list.add(tuple);
     }
   };
-  
+
   @Override
   public void setup(OperatorContext context)
   {
     // TODO Auto-generated method stub
-    
+
   }
 
   @Override
   public void teardown()
   {
     // TODO Auto-generated method stub
-    
+
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/UpdateOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/UpdateOperator.java b/library/src/main/java/com/datatorrent/lib/streamquery/UpdateOperator.java
index 83557f5..69ca3c3 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/UpdateOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/UpdateOperator.java
@@ -40,22 +40,22 @@ import com.datatorrent.lib.streamquery.condition.Condition;
  * <b> columns : </b> Column names/aggregate functions for select. <br>
  * <br>
  * @displayName Update
- * @category Streamquery
+ * @category Stream Manipulators
  * @tags sql update operator, sql condition
  * @since 0.3.3
  */
 public class UpdateOperator extends BaseOperator
-{ 
+{
   /**
    * Update value map.
    */
   Map<String, Object> updates = new HashMap<String, Object>();
-  
+
 	/**
 	 *  condition.
 	 */
 	private Condition condition = null;
-	
+
 	/**
 	 * set condition.
 	 */
@@ -63,7 +63,7 @@ public class UpdateOperator extends BaseOperator
 	{
 		this.condition = condition;
 	}
-	
+
   /**
    * Input port that takes a map of &lt;string,object&gt;.
    */
@@ -87,16 +87,16 @@ public class UpdateOperator extends BaseOperator
       outport.emit(result);
     }
   };
-  
+
   /**
    * Output port that emits a map of &lt;string,object&gt;.
    */
   public final transient DefaultOutputPort<Map<String, Object>> outport =  new DefaultOutputPort<Map<String, Object>>();
-  
+
   /**
    * Add update value.
    */
-  public void addUpdate(String name, Object value) 
+  public void addUpdate(String name, Object value)
   {
     updates.put(name, value);
   }

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/BetweenCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/BetweenCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/BetweenCondition.java
index 1bcf627..2214aaf 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/BetweenCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/BetweenCondition.java
@@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull;
  * <b> rightValue : </b> right range od column value. <br>
  * <br>
  * @displayName Between Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
  * @tags sql condition
  * @since 0.3.4
  */
@@ -37,33 +37,33 @@ public class BetweenCondition  extends Condition
   /**
    * Column name to be checked.
    */
-  @NotNull  
+  @NotNull
   private String column;
-  
+
   /**
    * Left range value.
    */
   @NotNull
   private Object leftValue;
-  
+
   /**
    * Right range value.
    */
   @NotNull
   private Object rightValue;
-  
+
   /**
    * @param  column  Name of column, must be non null. <br>
    * @param  leftValue  Left range for value, mut be non null. <br>
    * @param  rightValue  right range for value, mut be non null. <br>
    */
-  public BetweenCondition(@NotNull String column, @NotNull  Object leftValue, @NotNull Object rightValue) 
+  public BetweenCondition(@NotNull String column, @NotNull  Object leftValue, @NotNull Object rightValue)
   {
     this.column = column;
     this.leftValue = leftValue;
     this.rightValue = rightValue;
   }
-  
+
   /**
    * Validate given row.
    */
@@ -80,7 +80,7 @@ public class BetweenCondition  extends Condition
   }
 
   /**
-   * Must not be called. 
+   * Must not be called.
    */
   @Override
   public boolean isValidJoin(@NotNull Map<String, Object> row1, Map<String, Object> row2)

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/CompoundCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/CompoundCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/CompoundCondition.java
index 82c16f8..981c95c 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/CompoundCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/CompoundCondition.java
@@ -31,7 +31,7 @@ import javax.validation.constraints.NotNull;
  * <b> logicalOr : </b> OR/AND logical metric flag. <br>
  * <br>
  * @displayName Compound Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
  * @tags sql condition, logical
  * @since 0.3.4
  */
@@ -42,18 +42,18 @@ public class CompoundCondition extends Condition
    */
   @NotNull
   private Condition leftCondition;
-  
+
   /**
    * Right validate row condition .
    */
   @NotNull
   private Condition rightCondition;
-  
+
   /**
    * AND/OR metric flag.
    */
   private boolean logicalOr = true;
-  
+
   /**
    * Constructor for logical or metric.
    * @param leftCondition  Left validate row condition, must be non null. <br>
@@ -63,7 +63,7 @@ public class CompoundCondition extends Condition
     this.leftCondition = leftCondition;
     this.rightCondition = rightCondition;
   }
-  
+
   /**
    * Constructor for logical and metric if logical and parameter is true.
    * <br>
@@ -76,7 +76,7 @@ public class CompoundCondition extends Condition
     this.rightCondition = rightCondition;
     logicalOr = !isLogicalAnd;
   }
-  
+
   @Override
   public boolean isValidRow(Map<String, Object> row)
   {

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java
index a45c985..4fa3321 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java
@@ -20,11 +20,11 @@ import java.util.Map;
 import javax.validation.constraints.NotNull;
 
 /**
- * A base class for select condition for selecting or filtering the rows.&nbsp; Subclasses should provide the 
+ * A base class for select condition for selecting or filtering the rows.&nbsp; Subclasses should provide the
    implementation to filter valid rows and valid joins.
  * <p>
  * @displayName Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
  * @tags sql condition, filter
  * @since 0.3.3
  */
@@ -35,7 +35,7 @@ abstract public class Condition
 	 * @return row validation status.
 	 */
   abstract public boolean isValidRow(@NotNull Map<String, Object> row);
-  
+
   /**
    * Filter valid rows only.
    */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/EqualValueCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/EqualValueCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/EqualValueCondition.java
index 08015b3..13d7ea7 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/EqualValueCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/EqualValueCondition.java
@@ -20,14 +20,14 @@ import java.util.Map;
 
 
 /**
- * An implementation of condition on column equality. 
+ * An implementation of condition on column equality.
  * <p>
  * A valid row must have all key/value map in column name/value map.
  *
  * <b> Properties : </b> <br>
  *  <b> equalMap : </b> Column equal value map store.
  * @displayName Equal Value Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
  * @tags sql condition
  * @since 0.3.4
  */
@@ -77,7 +77,7 @@ public class EqualValueCondition extends Condition
 
   /**
    * check valid join, not implemented
-   * 
+   *
    * @return false
    */
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCompareValue.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCompareValue.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCompareValue.java
index dc4adef..5552f29 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCompareValue.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCompareValue.java
@@ -31,7 +31,7 @@ import com.datatorrent.lib.streamquery.function.FunctionIndex;
  *  <b> compareValue : </b>  Value to be compared. <br>
  *  <b>  compareType : </b> Type of comparison -1 == lt, 0 == eq, 1 == gt. <br>
  * @displayName Having Compare Value
- * @category Streamquery/Condition
+ * @category Stream Manipulators
  * @tags compare, sql condition
  * @since 0.3.4
  */
@@ -42,12 +42,12 @@ public class HavingCompareValue<T extends Comparable>   extends HavingCondition
    * Value to be compared.
    */
   private T compareValue;
-  
+
   /**
    * Type of comparison -1 == lt, 0 == eq, 1 == gt.
    */
-  private int compareType; 
-  
+  private int compareType;
+
   /**
    * @param aggregateIndex   aggregate index for comparison. <br>
    * @param compareValue     Value to be compared. <br>

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCondition.java
index fc530ab..4be9032 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/HavingCondition.java
@@ -23,11 +23,11 @@ import javax.validation.constraints.NotNull;
 import com.datatorrent.lib.streamquery.function.FunctionIndex;
 
 /**
- *  A base class for Group,Having operator with aggregate index constraint.&nsbsp; Subclasses should provide the 
+ *  A base class for Group,Having operator with aggregate index constraint.&nsbsp; Subclasses should provide the
     implementation to check if aggregate is valid.
  * <p>
  * @displayName Having Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
  * @tags sql condition, index, group
  * @since 0.3.4
  */
@@ -37,14 +37,14 @@ public abstract class HavingCondition
    * Aggregate index to be validated.
    */
   protected FunctionIndex  aggregateIndex = null;
-  
+
   /**
    * @param aggregateIndex  Aggregate index to be validated.
    */
   public HavingCondition(FunctionIndex  aggregateIndex) {
     this.aggregateIndex = aggregateIndex;
   }
-  
+
   /**
    *  Check if aggregate is valid.
    */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/InCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/InCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/InCondition.java
index 5822a1c..6278b2a 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/InCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/InCondition.java
@@ -29,30 +29,30 @@ import javax.validation.constraints.NotNull;
  * <b> column : </b> Column name for which value is checked in values set. <br>
  * <b> inValues : </b> Set of values in which column value is checked. <br>
  * @displayName In Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
  * @tags sql condition
  * @since 0.3.4
  */
 public class InCondition extends Condition
 {
   /**
-   * Column name for which value is checked in values set. 
+   * Column name for which value is checked in values set.
    */
   @NotNull
   private String column;
-  
+
   /**
    * Set of values in which column value is checked.
    */
   private Set<Object> inValues = new HashSet<Object>();
-  
+
   /**
    * @param  column Column name for which value is checked in values set.
    */
   public InCondition(@NotNull String column) {
     this.column = column;
   }
-  
+
   @Override
   public boolean isValidRow(@NotNull Map<String, Object> row)
   {
@@ -75,9 +75,9 @@ public class InCondition extends Condition
   {
     this.column = column;
   }
-  
+
   public void addInValue(Object value) {
     this.inValues.add(value);
   }
-   
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java
index 8f6da2f..08a69b0 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java
@@ -22,7 +22,7 @@ import javax.validation.constraints.NotNull;
 
 
 /**
- * An implementation of equal join condition class. 
+ * An implementation of equal join condition class.
  * <p>
  * This compares values of given keys in both row data.
  * <br>
@@ -30,7 +30,7 @@ import javax.validation.constraints.NotNull;
  * <b. equalkeys : </b> Keys for which value must be compared. <br>
  * <br>
  * @displayName Join Column Equal Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
  * @tags sql condition, equal join
  * @since 0.3.3
  */
@@ -38,18 +38,18 @@ public class JoinColumnEqualCondition  extends Condition
 {
 
   /**
-   * column names to be compared. 
+   * column names to be compared.
    */
   @NotNull
   private String column1;
   @NotNull
   private String column2;
-  
+
   public JoinColumnEqualCondition(@NotNull String column1,@NotNull String column2) {
     this.column1 = column1;
     this.column2 = column2;
   }
-  
+
   /**
    * Must never be called.
    */
@@ -61,7 +61,7 @@ public class JoinColumnEqualCondition  extends Condition
   }
 
   /**
-   * 
+   *
    */
   @Override
   public boolean isValidJoin(Map<String, Object> row1, Map<String, Object> row2)

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/condition/LikeCondition.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/LikeCondition.java b/library/src/main/java/com/datatorrent/lib/streamquery/condition/LikeCondition.java
index d5a0068..73c3405 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/condition/LikeCondition.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/condition/LikeCondition.java
@@ -29,7 +29,7 @@ import javax.validation.constraints.NotNull;
  *<b> column : < /b> Column to be matched with regular expression. <br>
  *<b> pattern : </b> Regular expression pattern.<br>
  * @displayName Like Condition
- * @category Streamquery/Condition
+ * @category Stream Manipulators
  * @tags sql, like condition, regular expression
  * @since 0.3.4
  */
@@ -40,13 +40,13 @@ public class LikeCondition extends Condition
    */
   @NotNull
   private String column;
-  
+
   /**
    * Regular expression pattern.
    */
   @NotNull
   private Pattern pattern;
-  
+
   /**
    * @param column Column to be matched with regular expression, must be non-null.
    * @param pattern Regular expression pattern, must be non-null.
@@ -55,9 +55,9 @@ public class LikeCondition extends Condition
     setColumn(column);
     setPattern(pattern);
   }
-  
+
   /**
-   * For valid row column value string must match regular expression.  
+   * For valid row column value string must match regular expression.
    * @return row valid status.
    */
   @Override
@@ -70,7 +70,7 @@ public class LikeCondition extends Condition
   }
 
   /**
-   * Must not be called. 
+   * Must not be called.
    */
   @Override
   public boolean isValidJoin(Map<String, Object> row1, Map<String, Object> row2)

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/AverageFunction.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/AverageFunction.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/AverageFunction.java
index 484601c..b64996d 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/AverageFunction.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/AverageFunction.java
@@ -31,17 +31,17 @@ import org.apache.commons.lang.StringUtils;
  *   <b> column : </b> Aggregate over given column values.   <br>
  *   <b> alias  : </b> Alias name for aggregate output. <br>
  * @displayName Average Function
- * @category Streamquery/Functions
+ * @category Stream Manipulators
  * @tags sql average
  * @since 0.3.4
  */
 public class AverageFunction  extends FunctionIndex
 {
   /**
-   * @param column Aggregate over given column values, must be non null. 
+   * @param column Aggregate over given column values, must be non null.
    * @param alias  Alias name for aggregate output.
    */
-  public AverageFunction(@NotNull String column, String alias) 
+  public AverageFunction(@NotNull String column, String alias)
   {
     super(column, alias);
   }

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/CountFunction.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/CountFunction.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/CountFunction.java
index 0bb4992..65bb03b 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/CountFunction.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/CountFunction.java
@@ -32,14 +32,14 @@ import org.apache.commons.lang.StringUtils;
  *   <b> column : </b> column name for values count.   <br>
  *   <b> alias  : </b> Alias name for aggregate output. <br>
  * @displayName Count Function
- * @category Streamquery/Functions
+ * @category Stream Manipulators
  * @tags sql count
  * @since 0.3.4
  */
 public class CountFunction extends FunctionIndex
 {
   /**
-   * @param column column for values count, must be non null. 
+   * @param column column for values count, must be non null.
    * @param alias  Alias name for aggregate output.
    */
   public CountFunction(@NotNull String column, String alias)

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/FirstLastFunction.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/FirstLastFunction.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/FirstLastFunction.java
index 37e6fc2..d0e8ead 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/FirstLastFunction.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/FirstLastFunction.java
@@ -32,7 +32,7 @@ import org.apache.commons.lang.StringUtils;
  *   <b> alias  : </b> Alias name for output. <br>
  *   <b> isFirst : </b> return first value if true.
  * @displayName First Last Function
- * @category Streamquery/Functions
+ * @category Stream Manipulators
  * @tags sql first, sql last
  * @since 0.3.4
  */
@@ -42,7 +42,7 @@ public class FirstLastFunction extends FunctionIndex
    * return first value if true.
    */
   private boolean isFirst;
-  
+
   /**
    * @param column  column name for first/last value.
    * @param  alias   Alias name for output.
@@ -53,7 +53,7 @@ public class FirstLastFunction extends FunctionIndex
     super(column, alias);
     isFirst = !isLast;
   }
-  
+
   /**
    * Get first/last non null value for column.
    */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/FunctionIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/FunctionIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/FunctionIndex.java
index 6fbfcbf..0330a0e 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/FunctionIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/FunctionIndex.java
@@ -21,54 +21,54 @@ import java.util.Map;
 import javax.validation.constraints.NotNull;
 
 /**
- * A base class for select aggregate function implementation.&nbsp; Subclasses should provide the 
-   implementation for aggregate compute functions. 
+ * A base class for select aggregate function implementation.&nbsp; Subclasses should provide the
+   implementation for aggregate compute functions.
  * <p>
  * <br>
  * <b>Properties : </b> <br>
  * <b>column : </b> Column name for aggregation.
  * <b>alias : </b> Output value alias name.
  * @displayName Function Index
- * @category Streamquery/Functions
+ * @category Stream Manipulators
  * @tags sql aggregate
  * @since 0.3.4
  */
-abstract public class FunctionIndex 
+abstract public class FunctionIndex
 {
   /**
    * Column name.
    */
   @NotNull
   protected String column;
-  
+
   /**
    * Alias name.
    */
   protected String alias;
-  
+
   /**
    * @param column Column name for aggregation.
    * @param alias Output value alias name.
    */
-  public FunctionIndex(@NotNull String column, String alias) 
+  public FunctionIndex(@NotNull String column, String alias)
   {
     this.column = column;
     this.alias = alias;
   }
-  
+
   /**
    * Aggregate compute function, implementation in sub class.
    * @param rows Tuple list over application window.
    * @return aggregate result object.
    */
   abstract public Object compute(@NotNull ArrayList<Map<String, Object>> rows) throws Exception;
-  
+
   /**
    * Get aggregate output value name.
    * @return name string.
    */
   abstract protected String aggregateName();
-  
+
   /**
    * Apply compute function to given rows and store result in collect by output value name.
    * @param  rows Tuple list over application window.

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/MaxMinFunction.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/MaxMinFunction.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/MaxMinFunction.java
index 06d6f51..3020428 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/MaxMinFunction.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/MaxMinFunction.java
@@ -32,7 +32,7 @@ import org.apache.commons.lang.StringUtils;
  *   <b> alias  : </b> Alias name for  output value. <br>
  *   <b> isMax : </b> Flag to indicate max/min compute value. <br>
  * @displayName Max Min Function
- * @category Streamquery/Functions
+ * @category Stream Manipulators
  * @tags sql max, sql min
  * @since 0.3.4
  */
@@ -42,7 +42,7 @@ public class MaxMinFunction extends FunctionIndex
    * Flag to indicate max/min compute value, compute max if true.
    */
   private boolean isMax = true;
-  
+
   /**
    * @param column column name for values max/min computation.   <br>
    * @param alias  Alias name for output. <br>

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/function/SumFunction.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/function/SumFunction.java b/library/src/main/java/com/datatorrent/lib/streamquery/function/SumFunction.java
index ef33d21..5603f60 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/function/SumFunction.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/function/SumFunction.java
@@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull;
  * <p> An implementation of sql sum function. </p>
  * <p>
  * @displayName Sum Function
- * @category Streamquery/Functions
+ * @category Stream Manipulators
  * @tags sql sum, aggregate
  * @since 0.3.4
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/BinaryExpression.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/BinaryExpression.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/BinaryExpression.java
index 00e50fb..1baa2ed 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/BinaryExpression.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/BinaryExpression.java
@@ -19,11 +19,11 @@ import javax.validation.constraints.NotNull;
 
 
 /**
- * Abstract class to filter row by binary expression index. 
+ * Abstract class to filter row by binary expression index.
  * <p>
  * Sub class will implement filter/getExpressionName functions.
  * @displayName Binary Expression
- * @category Streamquery/Index
+ * @category Stream Manipulators
  * @tags alias
  * @since 0.3.4
  */
@@ -34,13 +34,13 @@ abstract public class BinaryExpression  implements Index
    */
   @NotNull
   protected String left;
-  
+
   /**
    * Right column name argument for expression.
    */
   @NotNull
   protected String right;
-  
+
   /**
    *  Alias name for output field.
    */
@@ -51,7 +51,7 @@ abstract public class BinaryExpression  implements Index
    * @param Right column name argument for expression.
    * @param Alias name for output field.
    */
-  public BinaryExpression(@NotNull String left, @NotNull String right, String alias) 
+  public BinaryExpression(@NotNull String left, @NotNull String right, String alias)
   {
     this.left = left;
     this.right = right;

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java
index 5323264..c466835 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java
@@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull;
  * <p>An implementation of an index that overrides filter method on basis on columns. </p>
  * <p>
  * @displayName Column Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
  * @tags alias
  * @since 0.3.4
  */
@@ -39,7 +39,7 @@ public class ColumnIndex implements Index
   public ColumnIndex()
   {
   }
-  
+
   public ColumnIndex(@NotNull String column, String alias)
   {
     this.setColumn(column);

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java
index 0529fd7..b50739e 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull;
  * Interface to define sql select statement indexes for column names,aggregate.
  * <p>
  * @displayName Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
  * @tags index
  * @since 0.3.2
  */
@@ -32,5 +32,5 @@ public interface Index
   /**
    * Function can key/value hash map, does metric implemented by sub class.
    */
-	public void filter(@NotNull Map<String,Object> row, @NotNull Map<String, Object> collect);  
+	public void filter(@NotNull Map<String,Object> row, @NotNull Map<String, Object> collect);
 }

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/MidIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/MidIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/MidIndex.java
index 63cd7b0..6e664d8 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/MidIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/MidIndex.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull;
  * <p>An implementation of Column Index that implements filter method based on mid index. </p>
  * <p>
  * @displayName Mid Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
  * @tags index
  * @since 0.3.4
  */
@@ -31,12 +31,12 @@ public class MidIndex extends ColumnIndex
 {
   private int start;
   private int length = 0;
-  
+
   public MidIndex(@NotNull String column, String alias, int start)
   {
     super(column, alias);
     assert(start >= 0);
-    this.start = start;  
+    this.start = start;
   }
 
   @Override
@@ -48,7 +48,7 @@ public class MidIndex extends ColumnIndex
     }
     String name = getColumn();
     if (alias != null) name = alias;
-    
+
     int endIndex = start + length;
     if ((length == 0)||(endIndex > ((String)row.get(column)).length())) {
       collect.put(name, row.get(column));

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/NegateExpression.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/NegateExpression.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/NegateExpression.java
index a2e900b..356d2ea 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/NegateExpression.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/NegateExpression.java
@@ -24,7 +24,7 @@ import javax.validation.constraints.Null;
  * An implementation of Unary Expression that implements filter method using negate metric sql semantic on column value.
  * <p>
  * @displayName Negate Expression
- * @category Streamquery/Index
+ * @category Stream Manipulators
  * @tags expression, alias
  * @since 0.3.4
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/RoundDoubleIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/RoundDoubleIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/RoundDoubleIndex.java
index 587888c..2b6c0d7 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/RoundDoubleIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/RoundDoubleIndex.java
@@ -21,9 +21,9 @@ import javax.validation.constraints.NotNull;
 
 /**
  * <p>An implementation of column index that implements filter method using Round Double Index. </p>
- * 
+ *
  * @displayName Round Double Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
  * @tags alias, maths
  * @since 0.3.4
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/StringCaseIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/StringCaseIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/StringCaseIndex.java
index 49ddf11..56fbb25 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/StringCaseIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/StringCaseIndex.java
@@ -21,15 +21,15 @@ import javax.validation.constraints.NotNull;
 
 /**
  * <p>An implementation of Column Index that implements filter method using case of a string index. </p>
- * 
+ *
  * @displayName String Case Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
  * @tags alias
  * @since 0.3.4
  */
 public class StringCaseIndex extends  ColumnIndex
 {
-  private boolean toUpperCase = true; 
+  private boolean toUpperCase = true;
   public StringCaseIndex(@NotNull String column, String alias, boolean toLowerCase)
   {
     super(column, alias);
@@ -43,7 +43,7 @@ public class StringCaseIndex extends  ColumnIndex
     if (!(row.get(column) instanceof String)) {
       assert(false);
     }
-    
+
     String name = getColumn();
     if (alias != null) name = alias;
     if (toUpperCase) {

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/StringLenIndex.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/StringLenIndex.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/StringLenIndex.java
index 72ff067..3cfc650 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/StringLenIndex.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/StringLenIndex.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull;
  * <p>An implementation of Column Index that implements filter method using length of a string Index. </p>
  * <p>
  * @displayName String Length Index
- * @category Streamquery/Index
+ * @category Stream Manipulators
  * @tags alias
  * @since 0.3.4
  */
@@ -41,7 +41,7 @@ public class StringLenIndex  extends ColumnIndex
     if (!(row.get(column) instanceof String)) {
       assert(false);
     }
-    
+
     String name = getColumn();
     if (alias != null) name = alias;
     collect.put(name, ((String)row.get(column)).length());

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/SumExpression.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/SumExpression.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/SumExpression.java
index ad7af0f..aceae5c 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/SumExpression.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/SumExpression.java
@@ -21,11 +21,11 @@ import javax.validation.constraints.NotNull;
 
 
 /**
- * Implements sum on column index. 
+ * Implements sum on column index.
  * <p>
  * Select index class for implementing sum column index.
  * @displayName Sum Expression
- * @category Streamquery/Index
+ * @category Stream Manipulators
  * @tags sum
  * @since 0.3.4
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/streamquery/index/UnaryExpression.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/UnaryExpression.java b/library/src/main/java/com/datatorrent/lib/streamquery/index/UnaryExpression.java
index 0e08be9..49223cd 100644
--- a/library/src/main/java/com/datatorrent/lib/streamquery/index/UnaryExpression.java
+++ b/library/src/main/java/com/datatorrent/lib/streamquery/index/UnaryExpression.java
@@ -19,12 +19,12 @@ import javax.validation.constraints.NotNull;
 
 
 /**
- * A base implementation of an index that filters row by unary expression.&nbsp; Subclasses should provide the 
+ * A base implementation of an index that filters row by unary expression.&nbsp; Subclasses should provide the
    implementation of filter/getExpressionName functions.
  * <p>
  * Sub class will implement filter/getExpressionName functions.
  * @displayName Unary Expression
- * @category Streamquery/Index
+ * @category Stream Manipulators
  * @tags unary, alias
  * @since 0.3.4
  */
@@ -35,7 +35,7 @@ abstract public class UnaryExpression  implements Index
    */
   @NotNull
   protected String column;
-  
+
   /**
    *  Alias name for output field.
    */
@@ -45,7 +45,7 @@ abstract public class UnaryExpression  implements Index
    * @param Column name argument for unary expression.
    * @param Alias name for output field.
    */
-  public UnaryExpression(@NotNull String column, String alias) 
+  public UnaryExpression(@NotNull String column, String alias)
   {
     this.column = column;
   }

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java
index b6f946b..4910fdd 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java
@@ -22,10 +22,10 @@ import java.util.HashMap;
 import org.apache.commons.lang.mutable.MutableInt;
 
 /**
- * A sink implementation to collect expected test results in a HashMap. 
+ * A sink implementation to collect expected test results in a HashMap.
  * <p>
  * @displayName ArrayList Test Sink
- * @category Testbench
+ * @category Test Bench
  * @tags sink
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java
index 75d90c1..093bec5 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java
@@ -21,10 +21,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * A sink implementation to collect expected test results. 
+ * A sink implementation to collect expected test results.
  * <p>
  * @displayName Collector Test Sink
- * @category Testbench
+ * @category Test Bench
  * @tags sink
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java b/library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java
index 364ff4a..d314890 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java
@@ -26,7 +26,7 @@ import com.datatorrent.api.DefaultOutputPort;
  * <p>Implements Compare Filter Tuples class.</p>
  * <p>
  * @displayName Compare Filter Tuples
- * @category Testbench
+ * @category Test Bench
  * @tags map, compare
  * @since 0.3.2
  */
@@ -35,7 +35,7 @@ public class CompareFilterTuples<k> extends BaseOperator
 	// Compare type function
   private Compare compareType = Compare.Equal;
   public enum Compare { Smaller, Equal, Greater }
-  
+
   /**
    * Compare the incoming value with the Property value.
    * @param type Compare
@@ -44,17 +44,17 @@ public class CompareFilterTuples<k> extends BaseOperator
   {
   	compareType = type;
   }
-  
-  // compare value  
+
+  // compare value
   private int value;
   public void setValue(int value)
   {
   	this.value = value;
   }
-  
+
   // Collected result tuples
   private Map<k, Integer> result;
-  
+
         /**
 	 * Input port that takes a map of integer values.
 	 */
@@ -63,34 +63,34 @@ public class CompareFilterTuples<k> extends BaseOperator
     public void process(Map<k, Integer> map) {
     	for(Map.Entry<k, Integer> entry : map.entrySet())
     	{
-    		if ( compareType == Compare.Equal ) if(entry.getValue().intValue() == value) result.put(entry.getKey(), entry.getValue()); 
-    		if ( compareType == Compare.Greater ) if(entry.getValue().intValue() > value) result.put(entry.getKey(), entry.getValue()); 
-    		if ( compareType == Compare.Smaller ) if(entry.getValue().intValue() < value) result.put(entry.getKey(), entry.getValue()); 
+    		if ( compareType == Compare.Equal ) if(entry.getValue().intValue() == value) result.put(entry.getKey(), entry.getValue());
+    		if ( compareType == Compare.Greater ) if(entry.getValue().intValue() > value) result.put(entry.getKey(), entry.getValue());
+    		if ( compareType == Compare.Smaller ) if(entry.getValue().intValue() < value) result.put(entry.getKey(), entry.getValue());
     	}
     }
 	};
-	
+
 	/**
 	 * Output port that emits a map of integer values.
 	 */
 	public final transient DefaultOutputPort<Map<k, Integer>> outport = new DefaultOutputPort<Map<k, Integer>>();
-        
+
         /**
 	 * Output redis port that emits a map of &lt;integer,string&gt; values.
 	 */
 	public final transient DefaultOutputPort<Map<Integer, String>> redisport = new DefaultOutputPort<Map<Integer, String>>();
-	
+
 	@Override
 	public void beginWindow(long windowId)
 	{
 		result  = new HashMap<k, Integer>();
 	}
-	
+
 	@Override
 	public void endWindow()
 	{
 		outport.emit(result);
-		
+
 		int numOuts = 1;
 		Integer total = 0;
 		for (Map.Entry<k, Integer>  entry : result.entrySet())

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java
index cace693..9b2f0d8 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java
@@ -16,10 +16,10 @@
 package com.datatorrent.lib.testbench;
 
 /**
- * A sink implementation to collect expected test results. 
+ * A sink implementation to collect expected test results.
  * <p>
  * @displayName Count And Last Tuple Test Sink
- * @category Testbench
+ * @category Test Bench
  * @tags count, sink
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java b/library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java
index 220b8c3..508b094 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java
@@ -28,7 +28,7 @@ import com.datatorrent.api.Context.OperatorContext;
  * <p>A base implementation of an operator which does count occurrence.</p>
  * <p>
  * @displayName Count Occurrence
- * @category Testbench
+ * @category Test Bench
  * @tags count
  * @since 0.3.2
  */
@@ -63,22 +63,22 @@ public class CountOccurance<k> extends BaseOperator
 	{
 		collect  = new HashMap<k, Integer>();
 	}
-	
+
 	/**
 	 * Output port that emits a map of integer values.
 	 */
 	public final transient DefaultOutputPort<Map<k, Integer>> outport = new DefaultOutputPort<Map<k, Integer>>();
-        
+
         /**
 	 * Output dimensions port that emits a map of &lt;string,object&gt; values.
 	 */
 	public final transient DefaultOutputPort<Map<String, Object>> dimensionOut = new DefaultOutputPort<Map<String, Object>>();
-	
+
         /**
 	 * Output total port that emits a map of &lt;string,integer&gt; count values.
 	 */
         public final transient DefaultOutputPort<Map<String,Integer>> total = new DefaultOutputPort<Map<String,Integer>>();
-	
+
 	@Override
 	public void endWindow()
 	{

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java
index 3fc9c8e..05c70ae 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java
@@ -19,7 +19,7 @@ package com.datatorrent.lib.testbench;
  * A sink implementation to count expected test results.
  * <p>
  * @displayName Count Test Sink
- * @category Testbench
+ * @category Test Bench
  * @tags count, sink
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java b/library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java
index 5ab226a..d703ecb 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java
@@ -58,7 +58,7 @@ import java.util.Random;
  * <b>Benchmarks</b>: This node has been benchmarked at over 5 million tuples/second in local/inline mode<br>
  * <p>
  * @displayName Event Classifier
- * @category Testbench
+ * @category Test Bench
  * @tags hashmap,classification
  * @since 0.3.2
  */
@@ -116,7 +116,7 @@ public class EventClassifier extends BaseOperator
     }
     }
   };
-  
+
   /**
    * Output data port that emits a hashmap of &lt;string,double&gt;.
    */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java b/library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java
index ef5c83e..cb3717a 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
  * <br>
  * <b>Benchmarks</b>: This node has been benchmarked at over 5 million tuples/second in local/inline mode<br>
  * @displayName Event Classifier Number To HashDouble
- * @category Testbench
+ * @category Test Bench
  * @tags number, classifier
  * @since 0.3.2
  */
@@ -79,7 +79,7 @@ public class EventClassifierNumberToHashDouble<K extends Number> extends BaseOpe
       }
     }
   };
-  
+
   /**
    * Output data port that emits a hashmap of &lt;string,double&gt;.
    */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java b/library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java
index 12d02d6..97a848f 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java
@@ -64,24 +64,24 @@ import com.datatorrent.api.InputOperator;
  * String schema does about 26 Million tuples/sec in throughput<br>
  * HashMap schema does about 10 Million tuples/sec in throughput<br>
  * @displayName Event Generator
- * @category Testbench
+ * @category Test Bench
  * @tags input operator, generator
  * @since 0.3.2
  */
 public class EventGenerator implements InputOperator
 {
   private static final Logger LOG = LoggerFactory.getLogger(EventGenerator.class);
-  
+
   /**
    * Output string port that emits string data.
    */
   public final transient DefaultOutputPort<String> string_data = new DefaultOutputPort<String>();
-  
+
   /**
    * Output hash data port that emits a hashmap of &lt;string,double&gt;.
    */
   public final transient DefaultOutputPort<HashMap<String, Double>> hash_data = new DefaultOutputPort<HashMap<String, Double>>();
-  
+
   /**
    * Output count port that emits a hashmap of &lt;string,number&gt; which contains per window count of throughput.
    */
@@ -239,9 +239,9 @@ public class EventGenerator implements InputOperator
   public void teardown()
   {
   }
-  
+
  /**
- * Maximum number of Windows for this operation to run. 
+ * Maximum number of Windows for this operation to run.
  * @param i
  */
   public void setMaxCountOfWindows(int i)

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java b/library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java
index fca98df..9501322 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Creates a random movement by taking in a seed stream and incrementing this data. 
+ * Creates a random movement by taking in a seed stream and incrementing this data.
  * <p>
  * Takes in a seed stream on port seed and then increments this data on port increment. Data is immediately emitted on output port data.
  * Emits number of tuples on port count<p>
@@ -52,7 +52,7 @@ import java.util.Map;
  * Processing tuples on increment port are at 10 Million tuples/sec<br>
  * <br>
  * @displayName Event Incrementer
- * @category Testbench
+ * @category Test Bench
  * @tags increment, hashmap
  * @since 0.3.2
  */
@@ -86,7 +86,7 @@ public class EventIncrementer extends BaseOperator
       }
     }
   };
-  
+
   /**
    * Input increment port that takes a hashmap of &lt;string,hashmap of &lt;string,number&gt;&gt; which provides small random increments to the seed data.
    */
@@ -124,12 +124,12 @@ public class EventIncrementer extends BaseOperator
       }
     }
   };
-  
+
   /**
    * Output data port that emits a hashmap of &lt;string,string&gt; which is the addition of seed and increment.
    */
   public final transient DefaultOutputPort<HashMap<String, String>> data = new DefaultOutputPort<HashMap<String, String>>();
-  
+
   /**
    * Output count port that emits a hashmap of &lt;string,integer&gt; which contains number of processed tuples per window.
    */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java b/library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java
index 5b4ca31..ee48836 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java
@@ -52,7 +52,7 @@ import java.util.Random;
  * <br>
  * </p>
  * @displayName Filter Classifier
- * @category Testbench
+ * @category Test Bench
  * @tags filter
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java b/library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java
index 7c5b5c8..5201f66 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java
@@ -63,7 +63,7 @@ import java.util.Random;
  * This node has been benchmarked at over 20 million tuples/second in local/inline mode<br>
  * </p>
  * @displayName Filtered Event Classifier
- * @category Testbench
+ * @category Test Bench
  * @tags filter
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java
index 4f2860d..5e2db89 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java
@@ -24,7 +24,7 @@ import org.apache.commons.lang.mutable.MutableInt;
  * A sink implementation, which counts the number of times each tuples is collected and stores the results in a hash map.
  * <p></p>
  * @displayName Hash Count Test Sink
- * @category Testbench
+ * @category Test Bench
  * @tags sink, count
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java b/library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java
index 12c10ce..d1c63f3 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java
@@ -30,7 +30,7 @@ import com.datatorrent.api.Context.OperatorContext;
  * At the end of the application window each key and the number of times it occurred is emitted.
  * <p></p>
  * @displayName HTTP Status Filter
- * @category Testbench
+ * @category Test Bench
  * @tags filter, count
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java b/library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java
index 7ad8a12..48d1d5f 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java
@@ -28,7 +28,7 @@ import com.datatorrent.api.Context.OperatorContext;
  * In each application window the values for each key are summed and each string/sum pair is emitted at the end of each window.
  * <p></p>
  * @displayName Key Val Sum
- * @category Testbench
+ * @category Test Bench
  * @tags count
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java b/library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java
index 6fa693a..2b6c3c3 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java
@@ -54,7 +54,7 @@ import javax.validation.constraints.Min;
  * Compile time error checking includes<br>
  * </p>
  * @displayName Random Event Generator
- * @category Testbench
+ * @category Test Bench
  * @tags generate
  * @since 0.3.2
  */
@@ -127,7 +127,7 @@ public class RandomEventGenerator extends BaseOperator implements InputOperator
   }
 
   /**
-   * Maximum number of Windows across which this operator will work. 
+   * Maximum number of Windows across which this operator will work.
    * @param i
   */
   public void setMaxCountOfWindows(int i)

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java b/library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java
index 4d24486..f398cb3 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java
@@ -23,7 +23,7 @@ import javax.validation.constraints.Min;
 
 /**
  * This is an input operator which generates random tuples that are an array of bytes.
- *
+ * @category Test Bench
  * @since 2.0.0
  */
 public class RandomWordGenerator implements InputOperator

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java b/library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java
index 37252f6..236a675 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java
@@ -27,8 +27,8 @@ import com.datatorrent.api.Context.OperatorContext;
 /**
  * This operator collects integer tuples, then emits their sum at the end of the window.
  *
- * @displayName Redis Sum Oper
- * @category Testbench
+ * @displayName Redis Sum Operator
+ * @category Test Bench
  * @tags count
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java b/library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java
index e362038..1dcea6b 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java
@@ -65,7 +65,7 @@ import javax.validation.constraints.NotNull;
  * Integer: Benchmarked at over 7 million tuples/second in local/in-line mode<br>
  * </p>
  * @displayName Seed Event Classifier
- * @category Testbench
+ * @category Test Bench
  * @tags generate
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java b/library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java
index 6863045..b57077e 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
  * Without key: Benchmarked at over 4 million tuples/second in local/in-line mode<br>
  * </p>
  * @displayName Seed Event Generator
- * @category Testbench
+ * @category Test Bench
  * @tags generate
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java b/library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java
index a57e895..79c3447 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java
@@ -21,7 +21,7 @@ import com.datatorrent.api.Sink;
  * A sink implementation which collects Number tuples and sums their values.
  * <p></p>
  * @displayName Sum Test Sink
- * @category Testbench
+ * @category Test Bench
  * @tags numeric
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java b/library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java
index 91112e9..f362362 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
  * Benchmarked at over 17 million tuples/second in local/in-line mode<br>
  * </p>
  * @displayName Throughput Counter
- * @category Testbench
+ * @category Test Bench
  * @tags count
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java b/library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java
index de6e151..cb53c17 100644
--- a/library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java
+++ b/library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java
@@ -29,7 +29,7 @@ import com.datatorrent.api.DefaultOutputPort;
  * If the value of a pair is greater than the specified threshold then the tuple is emitted.
  * <p></p>
  * @displayName Top Occurrence
- * @category Testbench
+ * @category Test Bench
  * @tags numeric, compare
  * @since 0.3.2
  */
@@ -120,7 +120,7 @@ public class TopOccurrence extends BaseOperator
 
 	/**
 	 * Output n top values
-	 * @param n 
+	 * @param n
 	*/
 	public void setN(int n)
 	{
@@ -134,7 +134,7 @@ public class TopOccurrence extends BaseOperator
 
 	/**
 	 * Emit the tuples only if it's value is greater than the threshold.
-	 * @param threshold 
+	 * @param threshold
 	*/
 	public void setThreshold(int threshold)
 	{

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java b/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
index 5547d2b..43e98f9 100644
--- a/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
+++ b/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
@@ -32,7 +32,7 @@ import javax.validation.constraints.NotNull;
  * <b>data</b>: expects String<br>
  * </p>
  * @displayName Base Line Tokenizer
- * @category Stream Manipulator
+ * @category Stream Manipulators
  * @tags string
  * @since 0.3.2
  */

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java b/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
index 7887df9..6611650 100644
--- a/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
@@ -128,6 +128,19 @@ public class BaseMatchOperator<K, V> extends BaseKeyValueOperator<K, V>
     return ret;
   }
 
+  /**
+   * The comparator function to use.
+   * @param type The comparator function to user.
+   */
+  public void setType(ComparatorFunction type)
+  {
+    this.comparator = type;
+  }
+
+  /**
+   * The comparator function.
+   * @return The comparator function.
+   */
   public ComparatorFunction getType()
   {
     return comparator;

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java b/library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java
index 6163b55..49387ff 100644
--- a/library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java
@@ -39,7 +39,7 @@ public class BaseNumberValueOperator<V extends Number> extends BaseKeyOperator<V
   @NotNull
   protected V_TYPE type = V_TYPE.DOUBLE;
 
-  public V_TYPE getType()
+  public V_TYPE getVType()
   {
     return type;
   }
@@ -50,6 +50,16 @@ public class BaseNumberValueOperator<V extends Number> extends BaseKeyOperator<V
   }
 
   /**
+   * Gets the type.
+   * @omitFromUI
+   * @return The type.
+   */
+  public V_TYPE getType()
+  {
+    return type;
+  }
+
+  /**
    * This call ensures that type enum is set at setup time. At run time a switch statement suffices
    * If you derive your
    * @param ctype the type to set the operator to

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b7ba5212/library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java b/library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java
index f3d999a..430e349 100644
--- a/library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java
+++ b/library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
  * and the emitted map's values are another map from value fields to and accumulated value.
  * <p></p>
  * @displayName Dimension Time Bucket Sum
- * @category Algorithmic
+ * @category Stats and Aggregations
  * @tags count, key value, numeric
  * @since 0.3.2
  */