Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-1335: Allow UnpackContent to Handle application/x-tar mime.type 

- Add additinal `mime.type` for tar archives (application/x-tar)
- Update `UnpackContent` tests to verify auto-detect format property
This commit is contained in:
ricky 2015-12-28 14:43:55 -05:00
parent a915534e23
commit 236a2b72b6
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
View File

@ -175,6 +175,9 @@ public class UnpackContent extends AbstractProcessor {
case "application/tar": case "application/tar":
packagingFormat = TAR_FORMAT; packagingFormat = TAR_FORMAT;
break; break;
case "application/x-tar":
packagingFormat = TAR_FORMAT;
break;
case "application/zip": case "application/zip":
packagingFormat = ZIP_FORMAT; packagingFormat = ZIP_FORMAT;
break; break;

55
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
View File

@ -23,7 +23,9 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import org.apache.nifi.flowfile.attributes.CoreAttributes; import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.util.MockFlowFile; import org.apache.nifi.util.MockFlowFile;
@ -38,17 +40,29 @@ public class TestUnpackContent {
@Test @Test
public void testTar() throws IOException { public void testTar() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new UnpackContent()); final TestRunner unpackRunner = TestRunners.newTestRunner(new UnpackContent());
runner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.TAR_FORMAT); final TestRunner autoUnpackRunner = TestRunners.newTestRunner(new UnpackContent());
unpackRunner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.TAR_FORMAT);
autoUnpackRunner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.AUTO_DETECT_FORMAT);
unpackRunner.enqueue(dataPath.resolve("data.tar"));
Map<String, String> attributes = new HashMap<>(1);
Map<String, String> attributes2 = new HashMap<>(1);
attributes.put("mime.type", "application/x-tar");
attributes2.put("mime.type", "application/tar");
autoUnpackRunner.enqueue(dataPath.resolve("data.tar"), attributes);
autoUnpackRunner.enqueue(dataPath.resolve("data.tar"), attributes2);
unpackRunner.run();
autoUnpackRunner.run(2);
runner.enqueue(dataPath.resolve("data.tar")); unpackRunner.assertTransferCount(UnpackContent.REL_SUCCESS, 2);
runner.run(); unpackRunner.assertTransferCount(UnpackContent.REL_ORIGINAL, 1);
unpackRunner.assertTransferCount(UnpackContent.REL_FAILURE, 0);
runner.assertTransferCount(UnpackContent.REL_SUCCESS, 2); autoUnpackRunner.assertTransferCount(UnpackContent.REL_SUCCESS, 4);
runner.assertTransferCount(UnpackContent.REL_ORIGINAL, 1); autoUnpackRunner.assertTransferCount(UnpackContent.REL_ORIGINAL, 2);
runner.assertTransferCount(UnpackContent.REL_FAILURE, 0); autoUnpackRunner.assertTransferCount(UnpackContent.REL_FAILURE, 0);
final List<MockFlowFile> unpacked = runner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS); final List<MockFlowFile> unpacked = unpackRunner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
for (final MockFlowFile flowFile : unpacked) { for (final MockFlowFile flowFile : unpacked) {
final String filename = flowFile.getAttribute(CoreAttributes.FILENAME.key()); final String filename = flowFile.getAttribute(CoreAttributes.FILENAME.key());
final String folder = flowFile.getAttribute(CoreAttributes.PATH.key()); final String folder = flowFile.getAttribute(CoreAttributes.PATH.key());
@ -61,17 +75,26 @@ public class TestUnpackContent {
@Test @Test
public void testZip() throws IOException { public void testZip() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new UnpackContent()); final TestRunner unpackRunner = TestRunners.newTestRunner(new UnpackContent());
runner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.ZIP_FORMAT); final TestRunner autoUnpackRunner = TestRunners.newTestRunner(new UnpackContent());
runner.enqueue(dataPath.resolve("data.zip")); unpackRunner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.ZIP_FORMAT);
autoUnpackRunner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.AUTO_DETECT_FORMAT);
unpackRunner.enqueue(dataPath.resolve("data.zip"));
Map<String, String> attributes = new HashMap<>(1);
attributes.put("mime.type", "application/zip");
autoUnpackRunner.enqueue(dataPath.resolve("data.zip"), attributes);
unpackRunner.run();
autoUnpackRunner.run();
runner.run(); unpackRunner.assertTransferCount(UnpackContent.REL_SUCCESS, 2);
unpackRunner.assertTransferCount(UnpackContent.REL_ORIGINAL, 1);
unpackRunner.assertTransferCount(UnpackContent.REL_FAILURE, 0);
runner.assertTransferCount(UnpackContent.REL_SUCCESS, 2); autoUnpackRunner.assertTransferCount(UnpackContent.REL_SUCCESS, 2);
runner.assertTransferCount(UnpackContent.REL_ORIGINAL, 1); autoUnpackRunner.assertTransferCount(UnpackContent.REL_ORIGINAL, 1);
runner.assertTransferCount(UnpackContent.REL_FAILURE, 0); autoUnpackRunner.assertTransferCount(UnpackContent.REL_FAILURE, 0);
final List<MockFlowFile> unpacked = runner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS); final List<MockFlowFile> unpacked = unpackRunner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
for (final MockFlowFile flowFile : unpacked) { for (final MockFlowFile flowFile : unpacked) {
final String filename = flowFile.getAttribute(CoreAttributes.FILENAME.key()); final String filename = flowFile.getAttribute(CoreAttributes.FILENAME.key());
final String folder = flowFile.getAttribute(CoreAttributes.PATH.key()); final String folder = flowFile.getAttribute(CoreAttributes.PATH.key());