You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by oz...@apache.org on 2016/04/20 16:49:55 UTC
nifi git commit: NIFI-1788 Fixed listed allowable values
Repository: nifi
Updated Branches:
refs/heads/master 3d6e66409 -> 293a3042c
NIFI-1788 Fixed listed allowable values
NIFI-1788 Added UT
NIFI-1788 modified test name
This closes #368
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/293a3042
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/293a3042
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/293a3042
Branch: refs/heads/master
Commit: 293a3042cd4d8f0340f6e6be3f082acac97aaa67
Parents: 3d6e664
Author: Pierre Villard <pi...@gmail.com>
Authored: Wed Apr 20 12:24:39 2016 +0200
Committer: Oleg Zhurakousky <ol...@suitcase.io>
Committed: Wed Apr 20 10:48:54 2016 -0400
----------------------------------------------------------------------
.../nifi/processors/hadoop/CreateHadoopSequenceFile.java | 2 +-
.../nifi/processors/hadoop/SequenceFileWriterImpl.java | 6 ++++--
.../processors/hadoop/TestCreateHadoopSequenceFile.java | 11 +++++++++++
3 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/293a3042/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
index 4b8f87e..7770152 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java
@@ -90,7 +90,7 @@ public class CreateHadoopSequenceFile extends AbstractHadoopProcessor {
static final PropertyDescriptor COMPRESSION_TYPE = new PropertyDescriptor.Builder()
.name("compression type")
.description("Type of compression to use when creating Sequence File")
- .allowableValues(CompressionType.values())
+ .allowableValues(SequenceFile.CompressionType.values())
.build();
// Default Values.
http://git-wip-us.apache.org/repos/asf/nifi/blob/293a3042/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/SequenceFileWriterImpl.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/SequenceFileWriterImpl.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/SequenceFileWriterImpl.java
index a0d02f7..2c586e0 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/SequenceFileWriterImpl.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/SequenceFileWriterImpl.java
@@ -94,8 +94,10 @@ public class SequenceFileWriterImpl implements SequenceFileWriter {
try (final FSDataOutputStream fsDataOutputStream = new FSDataOutputStream(bwos, new Statistics(""));
final SequenceFile.Writer writer = SequenceFile.createWriter(configuration,
- fsDataOutputStream, Text.class, InputStreamWritable.class, compressionType,
- new DefaultCodec())) {
+ SequenceFile.Writer.stream(fsDataOutputStream),
+ SequenceFile.Writer.keyClass(Text.class),
+ SequenceFile.Writer.valueClass(InputStreamWritable.class),
+ SequenceFile.Writer.compression(compressionType, new DefaultCodec()))) {
processInputStream(in, flowFile, writer);
http://git-wip-us.apache.org/repos/asf/nifi/blob/293a3042/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestCreateHadoopSequenceFile.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestCreateHadoopSequenceFile.java b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestCreateHadoopSequenceFile.java
index e568dfb..8164fc0 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestCreateHadoopSequenceFile.java
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/test/java/org/apache/nifi/processors/hadoop/TestCreateHadoopSequenceFile.java
@@ -18,6 +18,8 @@ package org.apache.nifi.processors.hadoop;
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.io.Text;
+import org.apache.nifi.components.AllowableValue;
+import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.hadoop.KerberosProperties;
import org.apache.nifi.util.MockFlowFile;
@@ -80,6 +82,15 @@ public class TestCreateHadoopSequenceFile {
}
@Test
+ public void validateAllowableValuesForCompressionType() {
+ PropertyDescriptor pd = CreateHadoopSequenceFile.COMPRESSION_TYPE;
+ List<AllowableValue> allowableValues = pd.getAllowableValues();
+ assertEquals("NONE", allowableValues.get(0).getValue());
+ assertEquals("RECORD", allowableValues.get(1).getValue());
+ assertEquals("BLOCK", allowableValues.get(2).getValue());
+ }
+
+ @Test
public void testSimpleCase() throws IOException {
for (File inFile : inFiles) {
try (FileInputStream fin = new FileInputStream(inFile) ) {