From 08f7dc8991c05c26115557f1c625ca27fe1d7112 Mon Sep 17 00:00:00 2001 From: Pierre Villard Date: Wed, 20 Apr 2016 12:24:39 +0200 Subject: [PATCH 1/2] NIFI-1788 Fixed listed allowable values --- .../nifi/processors/hadoop/CreateHadoopSequenceFile.java | 2 +- .../nifi/processors/hadoop/SequenceFileWriterImpl.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 4b8f87e3835c..777015208dee 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. 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 a0d02f734640..2c586e0bb710 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 void process(InputStream in, OutputStream out) throws IOException { 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); From 1cac1ec7a553b2a7a1383e660b96b009722d17bf Mon Sep 17 00:00:00 2001 From: Pierre Villard Date: Wed, 20 Apr 2016 16:21:25 +0200 Subject: [PATCH 2/2] NIFI-1788 Added UT --- .../hadoop/TestCreateHadoopSequenceFile.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 e568dfb801c9..eded87c4af57 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 @@ 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; @@ -79,6 +81,15 @@ public void tearDown() { controller.clearTransferState(); } + @Test + public void validateAllowableValues() { + PropertyDescriptor pd = CreateHadoopSequenceFile.COMPRESSION_TYPE; + List 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) {