You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mt...@apache.org on 2018/10/12 10:29:51 UTC
nifi git commit: NIFI-5664 Support ArrayList in DataTypeUtils#toArray
NIFI-5664 Generalize to handling List
Repository: nifi
Updated Branches:
refs/heads/master 5aa426358 -> a6b9364eb
NIFI-5664 Support ArrayList in DataTypeUtils#toArray
NIFI-5664 Generalize to handling List
This closes #3049
Signed-off-by: Mike Thomsen <mi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a6b9364e
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a6b9364e
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a6b9364e
Branch: refs/heads/master
Commit: a6b9364ebf649679a739bfe4988899c4d9186f76
Parents: 5aa4263
Author: Carl Gieringer <ca...@snagajob.com>
Authored: Thu Oct 4 12:50:08 2018 -0400
Committer: Mike Thomsen <mi...@gmail.com>
Committed: Fri Oct 12 06:28:56 2018 -0400
----------------------------------------------------------------------
.../nifi/serialization/record/util/DataTypeUtils.java | 5 +++++
.../nifi/serialization/record/TestDataTypeUtils.java | 13 +++++++++++++
2 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/a6b9364e/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
index 687d9ed..336a70d 100644
--- a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
+++ b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
@@ -339,6 +339,11 @@ public class DataTypeUtils {
return dest;
}
+ if (value instanceof List) {
+ final List<?> list = (List<?>)value;
+ return list.toArray();
+ }
+
throw new IllegalTypeConversionException("Cannot convert value [" + value + "] of type " + value.getClass() + " to Object Array for field " + fieldName);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/a6b9364e/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
index a8bc28d..5f15fc2 100644
--- a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
+++ b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
@@ -24,6 +24,7 @@ import org.junit.Test;
import java.nio.charset.StandardCharsets;
import java.sql.Timestamp;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -169,6 +170,18 @@ public class TestDataTypeUtils {
}
@Test
+ public void testToArray() {
+ final List<String> list = Arrays.asList("Seven", "Eleven", "Thirteen");
+
+ final Object[] array = DataTypeUtils.toArray(list, "list", null);
+
+ assertEquals(list.size(), array.length);
+ for (int i = 0; i < list.size(); i++) {
+ assertEquals(list.get(i), array[i]);
+ }
+ }
+
+ @Test
public void testStringToBytes() {
Object bytes = DataTypeUtils.convertType("Hello", RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.BYTE.getDataType()),null, StandardCharsets.UTF_8);
assertTrue(bytes instanceof Byte[]);