[nifi] branch master updated: NIFI-6093: Add count and id fragment attributes to original FlowFile in SplitRecord

[markap14]

This is an automated email from the ASF dual-hosted git repository.

markap14 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new d0224f7  NIFI-6093: Add count and id fragment attributes to original 
FlowFile in SplitRecord
d0224f7 is described below

commit d0224f78970b8f30ae63f698f0a22239f22f1f9a
Author: Matthew Burgess <mattyb...@apache.org>
AuthorDate: Mon Apr 15 16:21:09 2019 -0400

    NIFI-6093: Add count and id fragment attributes to original FlowFile in 
SplitRecord
    
    This closes #3435.
    
    Signed-off-by: Mark Payne <marka...@hotmail.com>
---
 .../main/java/org/apache/nifi/processors/standard/SplitRecord.java   | 3 ++-
 .../java/org/apache/nifi/processors/standard/TestSplitRecord.java    | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitRecord.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitRecord.java
index d9e7bb5..6544357 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitRecord.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitRecord.java
@@ -206,7 +206,8 @@ public class SplitRecord extends AbstractProcessor {
             return;
         }
 
-        session.transfer(original, REL_ORIGINAL);
+        final FlowFile originalFlowFile = 
FragmentAttributes.copyAttributesToOriginal(session, original, fragmentId, 
splits.size());
+        session.transfer(originalFlowFile, REL_ORIGINAL);
         // Add the fragment count to each split
         for(FlowFile split : splits) {
             session.putAttribute(split, FRAGMENT_COUNT, 
String.valueOf(splits.size()));
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitRecord.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitRecord.java
index 6ce1165..ee8f302 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitRecord.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitRecord.java
@@ -80,10 +80,13 @@ public class TestSplitRecord {
             fragmentIndex++;
         }
 
-
         assertEquals(1, out.stream().filter(mff -> 
mff.isContentEqual("header\nJohn Doe,48\n")).count());
         assertEquals(1, out.stream().filter(mff -> 
mff.isContentEqual("header\nJane Doe,47\n")).count());
         assertEquals(1, out.stream().filter(mff -> 
mff.isContentEqual("header\nJimmy Doe,14\n")).count());
+
+        final MockFlowFile originalFlowFile = 
runner.getFlowFilesForRelationship(SplitRecord.REL_ORIGINAL).get(0);
+        originalFlowFile.assertAttributeEquals(SplitRecord.FRAGMENT_COUNT, 
"3");
+        originalFlowFile.assertAttributeEquals(SplitRecord.FRAGMENT_ID, 
fragmentUUID);
     }
 
     @Test