Skip to content

Commit 30eaa62

Browse files
committed
Code clean and fix unit-test
1 parent 3531840 commit 30eaa62

File tree

5 files changed

+15
-34
lines changed

5 files changed

+15
-34
lines changed

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
import io.cdap.cdap.api.annotation.Plugin;
2222
import io.cdap.wrangler.api.Arguments;
2323
import io.cdap.wrangler.api.Directive;
24-
import io.cdap.wrangler.api.DirectiveExecutionException;
2524
import io.cdap.wrangler.api.DirectiveParseException;
26-
import io.cdap.wrangler.api.ErrorRowException;
2725
import io.cdap.wrangler.api.ExecutorContext;
2826
import io.cdap.wrangler.api.Row;
2927
import io.cdap.wrangler.api.parser.ColumnName;
@@ -67,7 +65,7 @@ public void initialize(Arguments args) throws DirectiveParseException {
6765
}
6866

6967
@Override
70-
public List<Row> execute(List<Row> rows, ExecutorContext context) throws DirectiveExecutionException, ErrorRowException {
68+
public List<Row> execute(List<Row> rows, ExecutorContext context) {
7169
for (Row row : rows) {
7270
switch (codec) {
7371
case "md5": {

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

+5-14
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@
1919
import io.cdap.cdap.api.annotation.Description;
2020
import io.cdap.cdap.api.annotation.Name;
2121
import io.cdap.cdap.api.annotation.Plugin;
22-
import io.cdap.cdap.api.common.Bytes;
2322
import io.cdap.wrangler.api.Arguments;
2423
import io.cdap.wrangler.api.Directive;
25-
import io.cdap.wrangler.api.DirectiveExecutionException;
26-
import io.cdap.wrangler.api.DirectiveParseException;
27-
import io.cdap.wrangler.api.ErrorRowException;
2824
import io.cdap.wrangler.api.ExecutorContext;
2925
import io.cdap.wrangler.api.Row;
3026
import io.cdap.wrangler.api.parser.ColumnName;
@@ -53,26 +49,21 @@ public UsageDefinition define() {
5349
}
5450

5551
@Override
56-
public void initialize(Arguments args)
57-
throws DirectiveParseException {
52+
public void initialize(Arguments args) {
5853
column = ((ColumnName) args.value("column")).value();
5954
}
6055

6156
@Override
62-
public List<Row> execute(List<Row> rows, ExecutorContext context)
63-
throws DirectiveExecutionException, ErrorRowException {
57+
public List<Row> execute(List<Row> rows, ExecutorContext context) {
6458
for (Row row : rows) {
6559
int idx = row.find(column);
6660
if (idx != -1) {
6761
Object object = row.getValue(idx);
6862
if (object instanceof String) {
69-
if (object != null) {
70-
String value = (String) object;
71-
row.setValue(idx, value.length());
72-
}
73-
} else if (object instanceof byte[]) {
74-
String value = Bytes.toString((byte[])object);
63+
String value = (String) object;
7564
row.setValue(idx, value.length());
65+
} else if (object instanceof byte[]) {
66+
row.setValue(idx, ((byte[]) object).length);
7667
}
7768
}
7869
}

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

+7-14
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
import io.cdap.cdap.api.common.Bytes;
2323
import io.cdap.wrangler.api.Arguments;
2424
import io.cdap.wrangler.api.Directive;
25-
import io.cdap.wrangler.api.DirectiveExecutionException;
26-
import io.cdap.wrangler.api.DirectiveParseException;
27-
import io.cdap.wrangler.api.ErrorRowException;
2825
import io.cdap.wrangler.api.ExecutorContext;
2926
import io.cdap.wrangler.api.Row;
3027
import io.cdap.wrangler.api.parser.ColumnName;
@@ -53,27 +50,23 @@ public UsageDefinition define() {
5350
}
5451

5552
@Override
56-
public void initialize(Arguments args)
57-
throws DirectiveParseException {
53+
public void initialize(Arguments args) {
5854
column = ((ColumnName) args.value("column")).value();
5955
}
6056

6157
@Override
62-
public List<Row> execute(List<Row> rows, ExecutorContext context)
63-
throws DirectiveExecutionException, ErrorRowException {
58+
public List<Row> execute(List<Row> rows, ExecutorContext context) {
6459
for (Row row : rows) {
6560
int idx = row.find(column);
6661
if (idx != -1) {
6762
Object object = row.getValue(idx);
6863
if (object instanceof String) {
69-
if (object != null) {
70-
String value = (String) object;
71-
String reversed = new StringBuffer(value).reverse().toString();
72-
row.setValue(idx, reversed);
73-
}
64+
String value = (String) object;
65+
String reversed = new StringBuilder(value).reverse().toString();
66+
row.setValue(idx, reversed);
7467
} else if (object instanceof byte[]) {
75-
String value = Bytes.toString((byte[])object);
76-
String reversed = new StringBuffer(value).reverse().toString();
68+
String value = Bytes.toString((byte[]) object);
69+
String reversed = new StringBuilder(value).reverse().toString();
7770
row.setValue(idx, reversed);
7871
}
7972
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* Tests {@link RowHash}
3232
*/
3333
public class RowHashTest {
34-
@Ignore
34+
3535
@Test
3636
public void testBasicRowHash() throws Exception {
3737
TestRecipe recipe = new TestRecipe();

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.cdap.wrangler.test.api.TestRecipe;
2323
import io.cdap.wrangler.test.api.TestRows;
2424
import org.junit.Assert;
25-
import org.junit.Ignore;
2625
import org.junit.Test;
2726

2827
import java.util.List;
@@ -32,11 +31,11 @@
3231
*/
3332
public class TextReverseTest {
3433

35-
@Ignore
3634
@Test
3735
public void testBasicReverse() throws Exception {
3836
TestRecipe recipe = new TestRecipe();
3937
recipe.add("parse-as-csv :body ',';");
38+
recipe.add("drop :body");
4039
recipe.add("set-headers :a,:b,:c;");
4140
recipe.add("text-reverse :b");
4241

0 commit comments

Comments
 (0)