NIFI-4916 - ConvertExcelToCSVProcessor inherit parent attributes. This …

…closes #2500. Signed-off-by: Mark Payne <markap14@hotmail.com>
apache · Mar 2, 2018 · c58b025 · c58b025
1 parent b4a4cc5
commit c58b025
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...i-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java b/...i-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
@@ -292,7 +292,7 @@ public void process(InputStream inputStream) throws IOException {
     private void handleExcelSheet(ProcessSession session, FlowFile originalParentFF, final InputStream sheetInputStream, ExcelSheetReadConfig readConfig,
                                   CSVFormat csvFormat) throws IOException {
 
-        FlowFile ff = session.create();
+        FlowFile ff = session.create(originalParentFF);
         try {
             final DataFormatter formatter = new DataFormatter();
             final InputSource sheetSource = new InputSource(sheetInputStream);

diff --git a/...ocessors/src/test/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessorTest.java b/...ocessors/src/test/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessorTest.java
@@ -20,7 +20,9 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.nifi.csv.CSVUtils;
 import org.apache.nifi.flowfile.attributes.CoreAttributes;
@@ -44,7 +46,10 @@ public void init() {
     @Test
     public void testMultipleSheetsGeneratesMultipleFlowFiles() throws Exception {
 
-        testRunner.enqueue(new File("src/test/resources/TwoSheets.xlsx").toPath());
+        Map<String, String> attributes = new HashMap<String, String>();
+        attributes.put("test", "attribute");
+
+        testRunner.enqueue(new File("src/test/resources/TwoSheets.xlsx").toPath(), attributes);
         testRunner.run();
 
         testRunner.assertTransferCount(ConvertExcelToCSVProcessor.SUCCESS, 2);
@@ -59,6 +64,7 @@ public void testMultipleSheetsGeneratesMultipleFlowFiles() throws Exception {
 
         //Since TestRunner.run() will create a random filename even if the attribute is set in enqueue manually we just check that "_{SHEETNAME}.csv is present
         assertTrue(ffSheetA.getAttribute(CoreAttributes.FILENAME.key()).endsWith("_TestSheetA.csv"));
+        assertTrue(ffSheetA.getAttribute("test").equals("attribute"));
 
         MockFlowFile ffSheetB = testRunner.getFlowFilesForRelationship(ConvertExcelToCSVProcessor.SUCCESS).get(1);
         Long rowsSheetB = new Long(ffSheetB.getAttribute(ConvertExcelToCSVProcessor.ROW_NUM));
@@ -68,6 +74,7 @@ public void testMultipleSheetsGeneratesMultipleFlowFiles() throws Exception {
 
         //Since TestRunner.run() will create a random filename even if the attribute is set in enqueue manually we just check that "_{SHEETNAME}.csv is present
         assertTrue(ffSheetB.getAttribute(CoreAttributes.FILENAME.key()).endsWith("_TestSheetB.csv"));
+        assertTrue(ffSheetB.getAttribute("test").equals("attribute"));
 
     }