Repository: nifi Updated Branches: refs/heads/0.x 878cd7915 -> 7858310f0
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/7858310f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7858310f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7858310f Branch: refs/heads/0.x Commit: 7858310f05757b9414a9a36f0ac9c78b4e39a77c Parents: 878cd79 Author: Pierre Villard <[email protected]> Authored: Wed Apr 20 12:24:39 2016 +0200 Committer: Oleg Zhurakousky <[email protected]> Committed: Wed Apr 20 10:50:17 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/7858310f/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/7858310f/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/7858310f/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) ) {
