Merge branch 'release/4.0' into develop

Author: chtyim

src/main/java/org/example/directives/RowHash.java

@@ -21,9 +21,7 @@
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.wrangler.api.Arguments;
 import io.cdap.wrangler.api.Directive;
-import io.cdap.wrangler.api.DirectiveExecutionException;
 import io.cdap.wrangler.api.DirectiveParseException;
-import io.cdap.wrangler.api.ErrorRowException;
 import io.cdap.wrangler.api.ExecutorContext;
 import io.cdap.wrangler.api.Row;
 import io.cdap.wrangler.api.parser.ColumnName;
@@ -67,7 +65,7 @@ public void initialize(Arguments args) throws DirectiveParseException {
   }
 
   @Override
-  public List<Row> execute(List<Row> rows, ExecutorContext context) throws DirectiveExecutionException, ErrorRowException {
+  public List<Row> execute(List<Row> rows, ExecutorContext context) {
     for (Row row : rows) {
       switch (codec) {
         case "md5": {

src/main/java/org/example/directives/TextLength.java

@@ -19,12 +19,8 @@
 import io.cdap.cdap.api.annotation.Description;
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
-import io.cdap.cdap.api.common.Bytes;
 import io.cdap.wrangler.api.Arguments;
 import io.cdap.wrangler.api.Directive;
-import io.cdap.wrangler.api.DirectiveExecutionException;
-import io.cdap.wrangler.api.DirectiveParseException;
-import io.cdap.wrangler.api.ErrorRowException;
 import io.cdap.wrangler.api.ExecutorContext;
 import io.cdap.wrangler.api.Row;
 import io.cdap.wrangler.api.parser.ColumnName;
@@ -53,26 +49,21 @@ public UsageDefinition define() {
   }
 
   @Override
-  public void initialize(Arguments args)
-    throws DirectiveParseException {
+  public void initialize(Arguments args) {
     column = ((ColumnName) args.value("column")).value();
   }
 
   @Override
-  public List<Row> execute(List<Row> rows, ExecutorContext context)
-    throws DirectiveExecutionException, ErrorRowException {
+  public List<Row> execute(List<Row> rows, ExecutorContext context) {
     for (Row row : rows) {
       int idx = row.find(column);
       if (idx != -1) {
         Object object = row.getValue(idx);
         if (object instanceof String) {
-          if (object != null) {
-            String value = (String) object;
-            row.setValue(idx, value.length());
-          }
-        } else if (object instanceof byte[]) {
-          String value = Bytes.toString((byte[])object);
+          String value = (String) object;
           row.setValue(idx, value.length());
+        } else if (object instanceof byte[]) {
+          row.setValue(idx, ((byte[]) object).length);
         }
       }
     }

src/main/java/org/example/directives/TextReverse.java

@@ -22,9 +22,6 @@
 import io.cdap.cdap.api.common.Bytes;
 import io.cdap.wrangler.api.Arguments;
 import io.cdap.wrangler.api.Directive;
-import io.cdap.wrangler.api.DirectiveExecutionException;
-import io.cdap.wrangler.api.DirectiveParseException;
-import io.cdap.wrangler.api.ErrorRowException;
 import io.cdap.wrangler.api.ExecutorContext;
 import io.cdap.wrangler.api.Row;
 import io.cdap.wrangler.api.parser.ColumnName;
@@ -53,27 +50,23 @@ public UsageDefinition define() {
   }
 
   @Override
-  public void initialize(Arguments args)
-    throws DirectiveParseException {
+  public void initialize(Arguments args) {
     column = ((ColumnName) args.value("column")).value();
   }
 
   @Override
-  public List<Row> execute(List<Row> rows, ExecutorContext context)
-    throws DirectiveExecutionException, ErrorRowException {
+  public List<Row> execute(List<Row> rows, ExecutorContext context) {
     for (Row row : rows) {
       int idx = row.find(column);
       if (idx != -1) {
         Object object = row.getValue(idx);
         if (object instanceof String) {
-          if (object != null) {
-            String value = (String) object;
-            String reversed = new StringBuffer(value).reverse().toString();
-            row.setValue(idx, reversed);
-          }
+          String value = (String) object;
+          String reversed = new StringBuilder(value).reverse().toString();
+          row.setValue(idx, reversed);
         } else if (object instanceof byte[]) {
-          String value = Bytes.toString((byte[])object);
-          String reversed = new StringBuffer(value).reverse().toString();
+          String value = Bytes.toString((byte[]) object);
+          String reversed = new StringBuilder(value).reverse().toString();
           row.setValue(idx, reversed);
         }
       }

src/test/java/org/example/directives/RowHashTest.java

@@ -31,7 +31,7 @@
  * Tests {@link RowHash}
  */
 public class RowHashTest {
-  @Ignore
+
   @Test
   public void testBasicRowHash() throws Exception {
     TestRecipe recipe = new TestRecipe();

src/test/java/org/example/directives/TextReverseTest.java

@@ -22,7 +22,6 @@
 import io.cdap.wrangler.test.api.TestRecipe;
 import io.cdap.wrangler.test.api.TestRows;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
@@ -32,11 +31,11 @@
  */
 public class TextReverseTest {
 
-  @Ignore
   @Test
   public void testBasicReverse() throws Exception {
     TestRecipe recipe = new TestRecipe();
     recipe.add("parse-as-csv :body ',';");
+    recipe.add("drop :body");
     recipe.add("set-headers :a,:b,:c;");
     recipe.add("text-reverse :b");