You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2015/04/27 17:54:45 UTC
[01/12] incubator-nifi git commit: NIFI-271
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 548188939 -> d29a2d688
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
index aeb887a..aa28cc0 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
@@ -36,16 +36,6 @@ public class TestSplitText {
final Path dataPath = Paths.get("src/test/resources/TestSplitText");
final Path file = dataPath.resolve(originalFilename);
-// public static void main(final String[] args) throws IOException {
-// for (int i=1; i <= 4; i++) {
-// final Path path = Paths.get("src/test/resources/TestSplitText/" + i + ".txt");
-// final byte[] data = Files.readAllBytes(path);
-// final String text = new String(data, StandardCharsets.UTF_8);
-// final String updated = text.replace("\n", "\r\n");
-// final Path updatedPath = Paths.get("src/test/resources/TestSplitText/updated/" + i + ".txt");
-// Files.write(updatedPath, updated.getBytes(StandardCharsets.UTF_8), StandardOpenOption.CREATE_NEW);
-// }
-// }
@Test
public void testRoutesToFailureIfHeaderLinesNotAllPresent() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new SplitText());
@@ -81,22 +71,17 @@ public class TestSplitText {
runner.assertTransferCount(SplitText.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitText.REL_SPLITS, 4);
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitText.REL_SPLITS);
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitText.REL_SPLITS);
final String expected0 = "Header Line #1\nHeader Line #2\nLine #1";
final String expected1 = "Line #2\nLine #3\nLine #4";
final String expected2 = "Line #5\nLine #6\nLine #7";
final String expected3 = "Line #8\nLine #9\nLine #10";
- splits.get(0).
- assertContentEquals(expected0);
- splits.get(1).
- assertContentEquals(expected1);
- splits.get(2).
- assertContentEquals(expected2);
- splits.get(3).
- assertContentEquals(expected3);
+ splits.get(0).assertContentEquals(expected0);
+ splits.get(1).assertContentEquals(expected1);
+ splits.get(2).assertContentEquals(expected2);
+ splits.get(3).assertContentEquals(expected3);
}
@Test
@@ -112,14 +97,11 @@ public class TestSplitText {
runner.assertTransferCount(SplitText.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitText.REL_SPLITS, 4);
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitText.REL_SPLITS);
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitText.REL_SPLITS);
for (int i = 0; i < splits.size(); i++) {
final MockFlowFile split = splits.get(i);
- split.assertContentEquals(file.getParent().
- resolve((i + 1) + ".txt"));
- split.assertAttributeEquals(SplitText.FRAGMENT_INDEX, String.
- valueOf(i + 1));
+ split.assertContentEquals(file.getParent().resolve((i + 1) + ".txt"));
+ split.assertAttributeEquals(SplitText.FRAGMENT_INDEX, String.valueOf(i + 1));
}
}
@@ -136,26 +118,16 @@ public class TestSplitText {
runner.assertTransferCount(SplitText.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitText.REL_SPLITS, 2);
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitText.REL_SPLITS);
- splits.get(0).
- assertContentEquals(file.getParent().
- resolve("5.txt"));
- splits.get(0).
- assertAttributeEquals(SplitText.FRAGMENT_INDEX, String.
- valueOf(1));
- splits.get(1).
- assertContentEquals(file.getParent().
- resolve("6.txt"));
- splits.get(1).
- assertAttributeEquals(SplitText.FRAGMENT_INDEX, String.
- valueOf(2));
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitText.REL_SPLITS);
+ splits.get(0).assertContentEquals(file.getParent().resolve("5.txt"));
+ splits.get(0).assertAttributeEquals(SplitText.FRAGMENT_INDEX, String.valueOf(1));
+ splits.get(1).assertContentEquals(file.getParent().resolve("6.txt"));
+ splits.get(1).assertAttributeEquals(SplitText.FRAGMENT_INDEX, String.valueOf(2));
}
@Test
public void testSplitThenMerge() throws IOException {
- final TestRunner splitRunner = TestRunners.
- newTestRunner(new SplitText());
+ final TestRunner splitRunner = TestRunners.newTestRunner(new SplitText());
splitRunner.setProperty(SplitText.LINE_SPLIT_COUNT, "3");
splitRunner.setProperty(SplitText.REMOVE_TRAILING_NEWLINES, "false");
@@ -166,20 +138,15 @@ public class TestSplitText {
splitRunner.assertTransferCount(SplitText.REL_ORIGINAL, 1);
splitRunner.assertTransferCount(SplitText.REL_FAILURE, 0);
- final List<MockFlowFile> splits = splitRunner.
- getFlowFilesForRelationship(SplitText.REL_SPLITS);
+ final List<MockFlowFile> splits = splitRunner.getFlowFilesForRelationship(SplitText.REL_SPLITS);
for (final MockFlowFile flowFile : splits) {
- flowFile.
- assertAttributeEquals(SplitText.SEGMENT_ORIGINAL_FILENAME, originalFilename);
+ flowFile.assertAttributeEquals(SplitText.SEGMENT_ORIGINAL_FILENAME, originalFilename);
flowFile.assertAttributeEquals(SplitText.FRAGMENT_COUNT, "4");
}
- final TestRunner mergeRunner = TestRunners.
- newTestRunner(new MergeContent());
- mergeRunner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
- mergeRunner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
+ final TestRunner mergeRunner = TestRunners.newTestRunner(new MergeContent());
+ mergeRunner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
+ mergeRunner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
mergeRunner.enqueue(splits.toArray(new MockFlowFile[0]));
mergeRunner.run();
@@ -187,13 +154,10 @@ public class TestSplitText {
mergeRunner.assertTransferCount(MergeContent.REL_ORIGINAL, 4);
mergeRunner.assertTransferCount(MergeContent.REL_FAILURE, 0);
- final List<MockFlowFile> packed = mergeRunner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED);
+ final List<MockFlowFile> packed = mergeRunner.getFlowFilesForRelationship(MergeContent.REL_MERGED);
MockFlowFile flowFile = packed.get(0);
- flowFile.
- assertAttributeEquals(CoreAttributes.FILENAME.key(), originalFilename);
- assertEquals(Files.size(dataPath.resolve(originalFilename)), flowFile.
- getSize());
+ flowFile.assertAttributeEquals(CoreAttributes.FILENAME.key(), originalFilename);
+ assertEquals(Files.size(dataPath.resolve(originalFilename)), flowFile.getSize());
flowFile.assertContentEquals(file);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java
index 3f9e426..a84e031 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.SplitXml;
import java.io.IOException;
import java.io.StringReader;
import java.nio.file.Paths;
@@ -97,8 +96,7 @@ public class TestSplitXml {
for (MockFlowFile out : flowfiles) {
final byte[] outData = out.toByteArray();
final String outXml = new String(outData, "UTF-8");
- saxParser.
- parse(new InputSource(new StringReader(outXml)), new DefaultHandler());
+ saxParser.parse(new InputSource(new StringReader(outXml)), new DefaultHandler());
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTransformXml.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTransformXml.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTransformXml.java
index 620cb77..7074ec9 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTransformXml.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestTransformXml.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.TransformXml;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -39,18 +38,15 @@ public class TestTransformXml {
@Test
public void testStylesheetNotFound() throws IOException {
- final TestRunner controller = TestRunners.
- newTestRunner(TransformXml.class);
- controller.
- setProperty(TransformXml.XSLT_FILE_NAME, "/no/path/to/math.xsl");
+ final TestRunner controller = TestRunners.newTestRunner(TransformXml.class);
+ controller.setProperty(TransformXml.XSLT_FILE_NAME, "/no/path/to/math.xsl");
controller.assertNotValid();
}
@Test
public void testNonXmlContent() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new TransformXml());
- runner.
- setProperty(TransformXml.XSLT_FILE_NAME, "src/test/resources/TestTransformXml/math.xsl");
+ runner.setProperty(TransformXml.XSLT_FILE_NAME, "src/test/resources/TestTransformXml/math.xsl");
final Map<String, String> attributes = new HashMap<>();
runner.enqueue("not xml".getBytes(), attributes);
@@ -58,11 +54,8 @@ public class TestTransformXml {
runner.run();
runner.assertAllFlowFilesTransferred(TransformXml.REL_FAILURE);
- final MockFlowFile original = runner.
- getFlowFilesForRelationship(TransformXml.REL_FAILURE).
- get(0);
+ final MockFlowFile original = runner.getFlowFilesForRelationship(TransformXml.REL_FAILURE).get(0);
final String originalContent = new String(original.toByteArray(), StandardCharsets.UTF_8);
- System.out.println("originalContent:\n" + originalContent);
original.assertContentEquals("not xml");
}
@@ -72,32 +65,24 @@ public class TestTransformXml {
public void testTransformMath() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new TransformXml());
runner.setProperty("header", "Test for mod");
- runner.
- setProperty(TransformXml.XSLT_FILE_NAME, "src/test/resources/TestTransformXml/math.xsl");
+ runner.setProperty(TransformXml.XSLT_FILE_NAME, "src/test/resources/TestTransformXml/math.xsl");
final Map<String, String> attributes = new HashMap<>();
- runner.
- enqueue(Paths.
- get("src/test/resources/TestTransformXml/math.xml"), attributes);
+ runner.enqueue(Paths.get("src/test/resources/TestTransformXml/math.xml"), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(TransformXml.REL_SUCCESS);
- final MockFlowFile transformed = runner.
- getFlowFilesForRelationship(TransformXml.REL_SUCCESS).
- get(0);
+ final MockFlowFile transformed = runner.getFlowFilesForRelationship(TransformXml.REL_SUCCESS).get(0);
final String transformedContent = new String(transformed.toByteArray(), StandardCharsets.UTF_8);
- System.out.println("transformedContent:\n" + transformedContent);
- transformed.assertContentEquals(Paths.
- get("src/test/resources/TestTransformXml/math.html"));
+ transformed.assertContentEquals(Paths.get("src/test/resources/TestTransformXml/math.html"));
}
@Ignore("this test fails")
@Test
public void testTransformCsv() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new TransformXml());
- runner.
- setProperty(TransformXml.XSLT_FILE_NAME, "src/test/resources/TestTransformXml/tokens.xsl");
+ runner.setProperty(TransformXml.XSLT_FILE_NAME, "src/test/resources/TestTransformXml/tokens.xsl");
runner.setProperty("uuid_0", "${uuid_0}");
runner.setProperty("uuid_1", "${uuid_1}");
@@ -113,24 +98,18 @@ public class TestTransformXml {
String line = null;
while ((line = reader.readLine()) != null) {
- builder.append(line).
- append("\n");
+ builder.append(line).append("\n");
}
builder.append("</data>");
String data = builder.toString();
- System.out.println("Original content:\n" + data);
runner.enqueue(data.getBytes(), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(TransformXml.REL_SUCCESS);
- final MockFlowFile transformed = runner.
- getFlowFilesForRelationship(TransformXml.REL_SUCCESS).
- get(0);
+ final MockFlowFile transformed = runner.getFlowFilesForRelationship(TransformXml.REL_SUCCESS).get(0);
final String transformedContent = new String(transformed.toByteArray(), StandardCharsets.ISO_8859_1);
- System.out.println("transformedContent:\n" + transformedContent);
- transformed.assertContentEquals(Paths.
- get("src/test/resources/TestTransformXml/tokens.xml"));
+ transformed.assertContentEquals(Paths.get("src/test/resources/TestTransformXml/tokens.xml"));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
index 6035e08..04fe05a 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
@@ -16,8 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.UnpackContent;
-import org.apache.nifi.processors.standard.MergeContent;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -36,14 +34,12 @@ import org.junit.Test;
public class TestUnpackContent {
- private static final Path dataPath = Paths.
- get("src/test/resources/TestUnpackContent");
+ private static final Path dataPath = Paths.get("src/test/resources/TestUnpackContent");
@Test
public void testTar() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new UnpackContent());
- runner.
- setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.TAR_FORMAT);
+ runner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.TAR_FORMAT);
runner.enqueue(dataPath.resolve("data.tar"));
runner.run();
@@ -52,15 +48,11 @@ public class TestUnpackContent {
runner.assertTransferCount(UnpackContent.REL_ORIGINAL, 1);
runner.assertTransferCount(UnpackContent.REL_FAILURE, 0);
- final List<MockFlowFile> unpacked = runner.
- getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
+ final List<MockFlowFile> unpacked = runner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
for (final MockFlowFile flowFile : unpacked) {
- final String filename = flowFile.
- getAttribute(CoreAttributes.FILENAME.key());
- final String folder = flowFile.getAttribute(CoreAttributes.PATH.
- key());
- final Path path = dataPath.resolve(folder).
- resolve(filename);
+ final String filename = flowFile.getAttribute(CoreAttributes.FILENAME.key());
+ final String folder = flowFile.getAttribute(CoreAttributes.PATH.key());
+ final Path path = dataPath.resolve(folder).resolve(filename);
assertTrue(Files.exists(path));
flowFile.assertContentEquals(path.toFile());
@@ -70,8 +62,7 @@ public class TestUnpackContent {
@Test
public void testZip() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new UnpackContent());
- runner.
- setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.ZIP_FORMAT);
+ runner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.ZIP_FORMAT);
runner.enqueue(dataPath.resolve("data.zip"));
runner.run();
@@ -80,15 +71,11 @@ public class TestUnpackContent {
runner.assertTransferCount(UnpackContent.REL_ORIGINAL, 1);
runner.assertTransferCount(UnpackContent.REL_FAILURE, 0);
- final List<MockFlowFile> unpacked = runner.
- getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
+ final List<MockFlowFile> unpacked = runner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
for (final MockFlowFile flowFile : unpacked) {
- final String filename = flowFile.
- getAttribute(CoreAttributes.FILENAME.key());
- final String folder = flowFile.getAttribute(CoreAttributes.PATH.
- key());
- final Path path = dataPath.resolve(folder).
- resolve(filename);
+ final String filename = flowFile.getAttribute(CoreAttributes.FILENAME.key());
+ final String folder = flowFile.getAttribute(CoreAttributes.PATH.key());
+ final Path path = dataPath.resolve(folder).resolve(filename);
assertTrue(Files.exists(path));
flowFile.assertContentEquals(path.toFile());
@@ -98,8 +85,7 @@ public class TestUnpackContent {
@Test
public void testFlowFileStreamV3() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new UnpackContent());
- runner.
- setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.FLOWFILE_STREAM_FORMAT_V3);
+ runner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.FLOWFILE_STREAM_FORMAT_V3);
runner.enqueue(dataPath.resolve("data.flowfilev3"));
runner.run();
@@ -108,15 +94,11 @@ public class TestUnpackContent {
runner.assertTransferCount(UnpackContent.REL_ORIGINAL, 1);
runner.assertTransferCount(UnpackContent.REL_FAILURE, 0);
- final List<MockFlowFile> unpacked = runner.
- getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
+ final List<MockFlowFile> unpacked = runner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
for (final MockFlowFile flowFile : unpacked) {
- final String filename = flowFile.
- getAttribute(CoreAttributes.FILENAME.key());
- final String folder = flowFile.getAttribute(CoreAttributes.PATH.
- key());
- final Path path = dataPath.resolve(folder).
- resolve(filename);
+ final String filename = flowFile.getAttribute(CoreAttributes.FILENAME.key());
+ final String folder = flowFile.getAttribute(CoreAttributes.PATH.key());
+ final Path path = dataPath.resolve(folder).resolve(filename);
assertTrue(Files.exists(path));
flowFile.assertContentEquals(path.toFile());
@@ -126,8 +108,7 @@ public class TestUnpackContent {
@Test
public void testFlowFileStreamV2() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new UnpackContent());
- runner.
- setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.FLOWFILE_STREAM_FORMAT_V2);
+ runner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.FLOWFILE_STREAM_FORMAT_V2);
runner.enqueue(dataPath.resolve("data.flowfilev2"));
runner.run();
@@ -136,15 +117,11 @@ public class TestUnpackContent {
runner.assertTransferCount(UnpackContent.REL_ORIGINAL, 1);
runner.assertTransferCount(UnpackContent.REL_FAILURE, 0);
- final List<MockFlowFile> unpacked = runner.
- getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
+ final List<MockFlowFile> unpacked = runner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
for (final MockFlowFile flowFile : unpacked) {
- final String filename = flowFile.
- getAttribute(CoreAttributes.FILENAME.key());
- final String folder = flowFile.getAttribute(CoreAttributes.PATH.
- key());
- final Path path = dataPath.resolve(folder).
- resolve(filename);
+ final String filename = flowFile.getAttribute(CoreAttributes.FILENAME.key());
+ final String folder = flowFile.getAttribute(CoreAttributes.PATH.key());
+ final Path path = dataPath.resolve(folder).resolve(filename);
assertTrue(Files.exists(path));
flowFile.assertContentEquals(path.toFile());
@@ -153,10 +130,8 @@ public class TestUnpackContent {
@Test
public void testTarThenMerge() throws IOException {
- final TestRunner unpackRunner = TestRunners.
- newTestRunner(new UnpackContent());
- unpackRunner.
- setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.TAR_FORMAT);
+ final TestRunner unpackRunner = TestRunners.newTestRunner(new UnpackContent());
+ unpackRunner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.TAR_FORMAT);
unpackRunner.enqueue(dataPath.resolve("data.tar"));
unpackRunner.run();
@@ -165,19 +140,14 @@ public class TestUnpackContent {
unpackRunner.assertTransferCount(UnpackContent.REL_ORIGINAL, 1);
unpackRunner.assertTransferCount(UnpackContent.REL_FAILURE, 0);
- final List<MockFlowFile> unpacked = unpackRunner.
- getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
+ final List<MockFlowFile> unpacked = unpackRunner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
for (final MockFlowFile flowFile : unpacked) {
- assertEquals(flowFile.
- getAttribute(UnpackContent.SEGMENT_ORIGINAL_FILENAME), "data");
+ assertEquals(flowFile.getAttribute(UnpackContent.SEGMENT_ORIGINAL_FILENAME), "data");
}
- final TestRunner mergeRunner = TestRunners.
- newTestRunner(new MergeContent());
- mergeRunner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_TAR);
- mergeRunner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
+ final TestRunner mergeRunner = TestRunners.newTestRunner(new MergeContent());
+ mergeRunner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_TAR);
+ mergeRunner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
mergeRunner.setProperty(MergeContent.KEEP_PATH, "true");
mergeRunner.enqueue(unpacked.toArray(new MockFlowFile[0]));
mergeRunner.run();
@@ -186,20 +156,16 @@ public class TestUnpackContent {
mergeRunner.assertTransferCount(MergeContent.REL_ORIGINAL, 2);
mergeRunner.assertTransferCount(MergeContent.REL_FAILURE, 0);
- final List<MockFlowFile> packed = mergeRunner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED);
+ final List<MockFlowFile> packed = mergeRunner.getFlowFilesForRelationship(MergeContent.REL_MERGED);
for (final MockFlowFile flowFile : packed) {
- flowFile.
- assertAttributeEquals(CoreAttributes.FILENAME.key(), "data.tar");
+ flowFile.assertAttributeEquals(CoreAttributes.FILENAME.key(), "data.tar");
}
}
@Test
public void testZipThenMerge() throws IOException {
- final TestRunner unpackRunner = TestRunners.
- newTestRunner(new UnpackContent());
- unpackRunner.
- setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.ZIP_FORMAT);
+ final TestRunner unpackRunner = TestRunners.newTestRunner(new UnpackContent());
+ unpackRunner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.ZIP_FORMAT);
unpackRunner.enqueue(dataPath.resolve("data.zip"));
unpackRunner.run();
@@ -208,19 +174,14 @@ public class TestUnpackContent {
unpackRunner.assertTransferCount(UnpackContent.REL_ORIGINAL, 1);
unpackRunner.assertTransferCount(UnpackContent.REL_FAILURE, 0);
- final List<MockFlowFile> unpacked = unpackRunner.
- getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
+ final List<MockFlowFile> unpacked = unpackRunner.getFlowFilesForRelationship(UnpackContent.REL_SUCCESS);
for (final MockFlowFile flowFile : unpacked) {
- assertEquals(flowFile.
- getAttribute(UnpackContent.SEGMENT_ORIGINAL_FILENAME), "data");
+ assertEquals(flowFile.getAttribute(UnpackContent.SEGMENT_ORIGINAL_FILENAME), "data");
}
- final TestRunner mergeRunner = TestRunners.
- newTestRunner(new MergeContent());
- mergeRunner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_ZIP);
- mergeRunner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
+ final TestRunner mergeRunner = TestRunners.newTestRunner(new MergeContent());
+ mergeRunner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_ZIP);
+ mergeRunner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
mergeRunner.setProperty(MergeContent.KEEP_PATH, "true");
mergeRunner.enqueue(unpacked.toArray(new MockFlowFile[0]));
mergeRunner.run();
@@ -229,20 +190,16 @@ public class TestUnpackContent {
mergeRunner.assertTransferCount(MergeContent.REL_ORIGINAL, 2);
mergeRunner.assertTransferCount(MergeContent.REL_FAILURE, 0);
- final List<MockFlowFile> packed = mergeRunner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED);
+ final List<MockFlowFile> packed = mergeRunner.getFlowFilesForRelationship(MergeContent.REL_MERGED);
for (final MockFlowFile flowFile : packed) {
- flowFile.
- assertAttributeEquals(CoreAttributes.FILENAME.key(), "data.zip");
+ flowFile.assertAttributeEquals(CoreAttributes.FILENAME.key(), "data.zip");
}
}
@Test
public void testZipHandlesBadData() throws IOException {
- final TestRunner unpackRunner = TestRunners.
- newTestRunner(new UnpackContent());
- unpackRunner.
- setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.ZIP_FORMAT);
+ final TestRunner unpackRunner = TestRunners.newTestRunner(new UnpackContent());
+ unpackRunner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.ZIP_FORMAT);
unpackRunner.enqueue(dataPath.resolve("data.tar"));
unpackRunner.run();
@@ -254,10 +211,8 @@ public class TestUnpackContent {
@Test
public void testTarHandlesBadData() throws IOException {
- final TestRunner unpackRunner = TestRunners.
- newTestRunner(new UnpackContent());
- unpackRunner.
- setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.TAR_FORMAT);
+ final TestRunner unpackRunner = TestRunners.newTestRunner(new UnpackContent());
+ unpackRunner.setProperty(UnpackContent.PACKAGING_FORMAT, UnpackContent.TAR_FORMAT);
unpackRunner.enqueue(dataPath.resolve("data.zip"));
unpackRunner.run();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateXml.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateXml.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateXml.java
index d550183..7dfe5b6 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateXml.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestValidateXml.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.ValidateXml;
import java.io.IOException;
import java.nio.file.Paths;
@@ -31,8 +30,7 @@ public class TestValidateXml {
@Test
public void testValid() throws IOException, SAXException {
final TestRunner runner = TestRunners.newTestRunner(new ValidateXml());
- runner.
- setProperty(ValidateXml.SCHEMA_FILE, "src/test/resources/TestXml/XmlBundle.xsd");
+ runner.setProperty(ValidateXml.SCHEMA_FILE, "src/test/resources/TestXml/XmlBundle.xsd");
runner.enqueue(Paths.get("src/test/resources/TestXml/xml-snippet.xml"));
runner.run();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/UserAgentTestingServlet.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/UserAgentTestingServlet.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/UserAgentTestingServlet.java
index 347c338..e7fee65 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/UserAgentTestingServlet.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/UserAgentTestingServlet.java
@@ -37,6 +37,5 @@ public class UserAgentTestingServlet extends HttpServlet {
} else {
response.setStatus(500);
}
- return;
}
}
[07/12] incubator-nifi git commit: NIFI-271
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsProperties.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsProperties.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsProperties.java
index 8332082..ed73569 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsProperties.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsProperties.java
@@ -37,144 +37,144 @@ public class JmsProperties {
public static final String MSG_TYPE_EMPTY = "empty";
// Standard JMS Properties
- public static final PropertyDescriptor JMS_PROVIDER = new PropertyDescriptor.Builder().
- name("JMS Provider").
- description("The Provider used for the JMS Server").
- required(true).
- allowableValues(ACTIVEMQ_PROVIDER).
- defaultValue(ACTIVEMQ_PROVIDER).
- build();
- public static final PropertyDescriptor URL = new PropertyDescriptor.Builder().
- name("URL").
- description("The URL of the JMS Server").
- addValidator(StandardValidators.URI_VALIDATOR).
- required(true).
- build();
- public static final PropertyDescriptor TIMEOUT = new PropertyDescriptor.Builder().
- name("Communications Timeout").
- description("The amount of time to wait when attempting to receive a message before giving up and assuming failure").
- required(true).
- addValidator(StandardValidators.TIME_PERIOD_VALIDATOR).
- defaultValue("30 sec").
- build();
- public static final PropertyDescriptor USERNAME = new PropertyDescriptor.Builder().
- name("Username").
- description("Username used for authentication and authorization").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- build();
- public static final PropertyDescriptor PASSWORD = new PropertyDescriptor.Builder().
- name("Password").
- description("Password used for authentication and authorization").
- required(false).
- addValidator(Validator.VALID).
- sensitive(true).
- build();
- public static final PropertyDescriptor CLIENT_ID_PREFIX = new PropertyDescriptor.Builder().
- name("Client ID Prefix").
- description("A human-readable ID that can be used to associate connections with yourself so that the maintainers of the JMS Server know who to contact if problems arise").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- build();
+ public static final PropertyDescriptor JMS_PROVIDER = new PropertyDescriptor.Builder()
+ .name("JMS Provider")
+ .description("The Provider used for the JMS Server")
+ .required(true)
+ .allowableValues(ACTIVEMQ_PROVIDER)
+ .defaultValue(ACTIVEMQ_PROVIDER)
+ .build();
+ public static final PropertyDescriptor URL = new PropertyDescriptor.Builder()
+ .name("URL")
+ .description("The URL of the JMS Server")
+ .addValidator(StandardValidators.URI_VALIDATOR)
+ .required(true)
+ .build();
+ public static final PropertyDescriptor TIMEOUT = new PropertyDescriptor.Builder()
+ .name("Communications Timeout")
+ .description("The amount of time to wait when attempting to receive a message before giving up and assuming failure")
+ .required(true)
+ .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
+ .defaultValue("30 sec")
+ .build();
+ public static final PropertyDescriptor USERNAME = new PropertyDescriptor.Builder()
+ .name("Username")
+ .description("Username used for authentication and authorization")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor PASSWORD = new PropertyDescriptor.Builder()
+ .name("Password")
+ .description("Password used for authentication and authorization")
+ .required(false)
+ .addValidator(Validator.VALID)
+ .sensitive(true)
+ .build();
+ public static final PropertyDescriptor CLIENT_ID_PREFIX = new PropertyDescriptor.Builder()
+ .name("Client ID Prefix")
+ .description("A human-readable ID that can be used to associate connections with yourself so that the maintainers of the JMS Server know who to contact if problems arise")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .build();
// Topic/Queue determination Properties
- public static final PropertyDescriptor DESTINATION_NAME = new PropertyDescriptor.Builder().
- name("Destination Name").
- description("The name of the JMS Topic or queue to use").
- required(true).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- build();
- public static final PropertyDescriptor DESTINATION_TYPE = new PropertyDescriptor.Builder().
- name("Destination Type").
- description("The type of the JMS Destination to use").
- required(true).
- allowableValues(DESTINATION_TYPE_QUEUE, DESTINATION_TYPE_TOPIC).
- defaultValue(DESTINATION_TYPE_QUEUE).
- build();
+ public static final PropertyDescriptor DESTINATION_NAME = new PropertyDescriptor.Builder()
+ .name("Destination Name")
+ .description("The name of the JMS Topic or queue to use")
+ .required(true)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor DESTINATION_TYPE = new PropertyDescriptor.Builder()
+ .name("Destination Type")
+ .description("The type of the JMS Destination to use")
+ .required(true)
+ .allowableValues(DESTINATION_TYPE_QUEUE, DESTINATION_TYPE_TOPIC)
+ .defaultValue(DESTINATION_TYPE_QUEUE)
+ .build();
- public static final PropertyDescriptor DURABLE_SUBSCRIPTION = new PropertyDescriptor.Builder().
- name("Use Durable Subscription").
- description("If true, connections to the specified topic will use Durable Subscription so that messages are queued when we are not pulling them").
- required(true).
- allowableValues("true", "false").
- defaultValue("false").
- build();
+ public static final PropertyDescriptor DURABLE_SUBSCRIPTION = new PropertyDescriptor.Builder()
+ .name("Use Durable Subscription")
+ .description("If true, connections to the specified topic will use Durable Subscription so that messages are queued when we are not pulling them")
+ .required(true)
+ .allowableValues("true", "false")
+ .defaultValue("false")
+ .build();
// JMS Publisher Properties
- public static final PropertyDescriptor ATTRIBUTES_TO_JMS_PROPS = new PropertyDescriptor.Builder().
- name("Copy Attributes to JMS Properties").
- description("Whether or not FlowFile Attributes should be translated into JMS Message Properties. If true, all "
+ public static final PropertyDescriptor ATTRIBUTES_TO_JMS_PROPS = new PropertyDescriptor.Builder()
+ .name("Copy Attributes to JMS Properties")
+ .description("Whether or not FlowFile Attributes should be translated into JMS Message Properties. If true, all "
+ "attributes starting with 'jms.' will be set as Properties on the JMS Message (without the 'jms.' prefix). "
+ "If an attribute exists that starts with the same value but ends in '.type', that attribute will be used "
- + "to determine the JMS Message Property type.").
- required(true).
- allowableValues("true", "false").
- defaultValue("true").
- build();
+ + "to determine the JMS Message Property type.")
+ .required(true)
+ .allowableValues("true", "false")
+ .defaultValue("true")
+ .build();
// JMS Listener Properties
- public static final PropertyDescriptor BATCH_SIZE = new PropertyDescriptor.Builder().
- name("Message Batch Size").
- description("The number of messages to pull/push in a single iteration of the processor").
- required(true).
- addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR).
- defaultValue("10").
- build();
- public static final PropertyDescriptor ACKNOWLEDGEMENT_MODE = new PropertyDescriptor.Builder().
- name("Acknowledgement Mode").
- description("The JMS Acknowledgement Mode. Using Auto Acknowledge can cause messages to be lost on restart of NiFi but may provide better performance than Client Acknowledge.").
- required(true).
- allowableValues(ACK_MODE_CLIENT, ACK_MODE_AUTO).
- defaultValue(ACK_MODE_CLIENT).
- build();
- public static final PropertyDescriptor JMS_PROPS_TO_ATTRIBUTES = new PropertyDescriptor.Builder().
- name("Copy JMS Properties to Attributes").
- description("Whether or not the JMS Message Properties should be copied to the FlowFile Attributes; if so, the attribute name will be jms.XXX, where XXX is the JMS Property name").
- required(true).
- allowableValues("true", "false").
- defaultValue("true").
- build();
- public static final PropertyDescriptor MESSAGE_SELECTOR = new PropertyDescriptor.Builder().
- name("Message Selector").
- description("The JMS Message Selector to use in order to narrow the messages that are pulled").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- build();
+ public static final PropertyDescriptor BATCH_SIZE = new PropertyDescriptor.Builder()
+ .name("Message Batch Size")
+ .description("The number of messages to pull/push in a single iteration of the processor")
+ .required(true)
+ .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
+ .defaultValue("10")
+ .build();
+ public static final PropertyDescriptor ACKNOWLEDGEMENT_MODE = new PropertyDescriptor.Builder()
+ .name("Acknowledgement Mode")
+ .description("The JMS Acknowledgement Mode. Using Auto Acknowledge can cause messages to be lost on restart of NiFi but may provide better performance than Client Acknowledge.")
+ .required(true)
+ .allowableValues(ACK_MODE_CLIENT, ACK_MODE_AUTO)
+ .defaultValue(ACK_MODE_CLIENT)
+ .build();
+ public static final PropertyDescriptor JMS_PROPS_TO_ATTRIBUTES = new PropertyDescriptor.Builder()
+ .name("Copy JMS Properties to Attributes")
+ .description("Whether or not the JMS Message Properties should be copied to the FlowFile Attributes; if so, the attribute name will be jms.XXX, where XXX is the JMS Property name")
+ .required(true)
+ .allowableValues("true", "false")
+ .defaultValue("true")
+ .build();
+ public static final PropertyDescriptor MESSAGE_SELECTOR = new PropertyDescriptor.Builder()
+ .name("Message Selector")
+ .description("The JMS Message Selector to use in order to narrow the messages that are pulled")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .build();
// JMS Producer Properties
- public static final PropertyDescriptor MESSAGE_TYPE = new PropertyDescriptor.Builder().
- name("Message Type").
- description("The Type of JMS Message to Construct").
- required(true).
- allowableValues(MSG_TYPE_BYTE, MSG_TYPE_STREAM, MSG_TYPE_TEXT, MSG_TYPE_MAP, MSG_TYPE_EMPTY).
- defaultValue(MSG_TYPE_BYTE).
- build();
- public static final PropertyDescriptor MESSAGE_PRIORITY = new PropertyDescriptor.Builder().
- name("Message Priority").
- description("The Priority of the Message").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor REPLY_TO_QUEUE = new PropertyDescriptor.Builder().
- name("Reply-To Queue").
- description("The name of the queue to which a reply to should be added").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor MESSAGE_TTL = new PropertyDescriptor.Builder().
- name("Message Time to Live").
- description("The amount of time that the message should live on the destination before being removed; if not specified, the message will never expire.").
- required(false).
- addValidator(StandardValidators.TIME_PERIOD_VALIDATOR).
- build();
- public static final PropertyDescriptor MAX_BUFFER_SIZE = new PropertyDescriptor.Builder().
- name("Max Buffer Size").
- description("The maximum amount of data that can be buffered for a JMS Message. If a FlowFile's size exceeds this value, the FlowFile will be routed to failure.").
- required(true).
- addValidator(StandardValidators.DATA_SIZE_VALIDATOR).
- defaultValue("1 MB").
- build();
+ public static final PropertyDescriptor MESSAGE_TYPE = new PropertyDescriptor.Builder()
+ .name("Message Type")
+ .description("The Type of JMS Message to Construct")
+ .required(true)
+ .allowableValues(MSG_TYPE_BYTE, MSG_TYPE_STREAM, MSG_TYPE_TEXT, MSG_TYPE_MAP, MSG_TYPE_EMPTY)
+ .defaultValue(MSG_TYPE_BYTE)
+ .build();
+ public static final PropertyDescriptor MESSAGE_PRIORITY = new PropertyDescriptor.Builder()
+ .name("Message Priority")
+ .description("The Priority of the Message")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor REPLY_TO_QUEUE = new PropertyDescriptor.Builder()
+ .name("Reply-To Queue")
+ .description("The name of the queue to which a reply to should be added")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor MESSAGE_TTL = new PropertyDescriptor.Builder()
+ .name("Message Time to Live")
+ .description("The amount of time that the message should live on the destination before being removed; if not specified, the message will never expire.")
+ .required(false)
+ .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor MAX_BUFFER_SIZE = new PropertyDescriptor.Builder()
+ .name("Max Buffer Size")
+ .description("The maximum amount of data that can be buffered for a JMS Message. If a FlowFile's size exceeds this value, the FlowFile will be routed to failure.")
+ .required(true)
+ .addValidator(StandardValidators.DATA_SIZE_VALIDATOR)
+ .defaultValue("1 MB")
+ .build();
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JsonPathExpressionValidator.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JsonPathExpressionValidator.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JsonPathExpressionValidator.java
index 8a1a056..2a0bd43 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JsonPathExpressionValidator.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JsonPathExpressionValidator.java
@@ -36,10 +36,8 @@ import java.util.regex.Pattern;
import static java.util.Arrays.asList;
/**
- * JsonPathExpressionValidator performs the same execution as
- * com.jayway.jsonpath.internal.PathCompiler, but does not throw exceptions when
- * an invalid path segment is found. Limited access to create JsonPath objects
- * requires a separate flow of execution in avoiding exceptions.
+ * JsonPathExpressionValidator performs the same execution as com.jayway.jsonpath.internal.PathCompiler, but does not throw exceptions when an invalid path segment is found. Limited access to create
+ * JsonPath objects requires a separate flow of execution in avoiding exceptions.
*
* @see
* <a href="https://github.com/jayway/JsonPath">https://github.com/jayway/JsonPath</a>
@@ -72,8 +70,7 @@ public class JsonPathExpressionValidator {
* </code>
*
* @param path to evaluate for validity
- * @param filters applied to path expression; this is typically unused in
- * the context of Processors
+ * @param filters applied to path expression; this is typically unused in the context of Processors
* @return true if the specified path is valid; false otherwise
*/
public static boolean isValidExpression(String path, Predicate... filters) {
@@ -138,8 +135,7 @@ public class JsonPathExpressionValidator {
} else if (positions == 1 && path.charAt(i) == '*') {
fragment = "[*]";
} else {
- fragment = PROPERTY_OPEN + path.
- substring(i, i + positions) + PROPERTY_CLOSE;
+ fragment = PROPERTY_OPEN + path.substring(i, i + positions) + PROPERTY_CLOSE;
}
i += positions;
}
@@ -160,8 +156,7 @@ public class JsonPathExpressionValidator {
* Analyze each component represented by a fragment. If there is a failure to properly evaluate,
* a null result is returned
*/
- PathToken analyzedComponent = PathComponentAnalyzer.
- analyze(fragment, filterList);
+ PathToken analyzedComponent = PathComponentAnalyzer.analyze(fragment, filterList);
if (analyzedComponent == null) {
return false;
}
@@ -219,8 +214,7 @@ public class JsonPathExpressionValidator {
static class PathComponentAnalyzer {
- private static final Pattern FILTER_PATTERN = Pattern.
- compile("^\\[\\s*\\?\\s*[,\\s*\\?]*?\\s*]$"); //[?] or [?, ?, ...]
+ private static final Pattern FILTER_PATTERN = Pattern.compile("^\\[\\s*\\?\\s*[,\\s*\\?]*?\\s*]$"); //[?] or [?, ?, ...]
private int i;
private char current;
@@ -248,8 +242,7 @@ public class JsonPathExpressionValidator {
return new WildcardPathToken();
} else if ("[?]".equals(pathFragment)) {
return new PredicatePathToken(filterList.poll());
- } else if (FILTER_PATTERN.matcher(pathFragment).
- matches()) {
+ } else if (FILTER_PATTERN.matcher(pathFragment).matches()) {
final int criteriaCount = Utils.countMatches(pathFragment, "?");
List<Predicate> filters = new ArrayList<>(criteriaCount);
for (int i = 0; i < criteriaCount; i++) {
@@ -288,8 +281,7 @@ public class JsonPathExpressionValidator {
}
i = bounds[1];
- return new PredicatePathToken(Filter.parse(pathFragment.
- substring(bounds[0], bounds[1])));
+ return new PredicatePathToken(Filter.parse(pathFragment.substring(bounds[0], bounds[1])));
}
int[] findFilterBounds() {
@@ -461,8 +453,7 @@ public class JsonPathExpressionValidator {
sliceFrom = true;
} else {
sliceBetween = true;
- numbers.add(Integer.parseInt(buffer.
- toString()));
+ numbers.add(Integer.parseInt(buffer.toString()));
buffer.setLength(0);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/NLKBufferedReader.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/NLKBufferedReader.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/NLKBufferedReader.java
index 20726b2..c524761 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/NLKBufferedReader.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/NLKBufferedReader.java
@@ -35,8 +35,7 @@ public class NLKBufferedReader extends BufferedReader {
private static int defaultExpectedLineLength = 80;
/**
- * Creates a buffering character-input stream that uses an input buffer of
- * the specified size.
+ * Creates a buffering character-input stream that uses an input buffer of the specified size.
*
* @param in A Reader
* @param sz Input-buffer size
@@ -51,8 +50,7 @@ public class NLKBufferedReader extends BufferedReader {
}
/**
- * Creates a buffering character-input stream that uses a default-sized
- * input buffer.
+ * Creates a buffering character-input stream that uses a default-sized input buffer.
*
* @param in A Reader
*/
@@ -61,13 +59,9 @@ public class NLKBufferedReader extends BufferedReader {
}
/**
- * Reads a line of text. A line is considered to be terminated by any one of
- * a line feed ('\n'), a carriage return ('\r'), or a carriage return
- * followed immediately by a linefeed.
+ * Reads a line of text. A line is considered to be terminated by any one of a line feed ('\n'), a carriage return ('\r'), or a carriage return followed immediately by a linefeed.
*
- * @return A String containing the contents of the line, including any
- * line-termination characters, or null if the end of the stream has been
- * reached
+ * @return A String containing the contents of the line, including any line-termination characters, or null if the end of the stream has been reached
*
* @exception IOException If an I/O error occurs
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
index c8e7b78..5034b83 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
@@ -50,64 +50,61 @@ import com.jcraft.jsch.SftpException;
public class SFTPTransfer implements FileTransfer {
- public static final PropertyDescriptor PRIVATE_KEY_PATH = new PropertyDescriptor.Builder().
- name("Private Key Path").
- description("The fully qualified path to the Private Key file").
- required(false).
- addValidator(StandardValidators.FILE_EXISTS_VALIDATOR).
- build();
- public static final PropertyDescriptor PRIVATE_KEY_PASSPHRASE = new PropertyDescriptor.Builder().
- name("Private Key Passphrase").
- description("Password for the private key").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- sensitive(true).
- build();
- public static final PropertyDescriptor HOST_KEY_FILE = new PropertyDescriptor.Builder().
- name("Host Key File").
- description("If supplied, the given file will be used as the Host Key; otherwise, no use host key file will be used").
- addValidator(StandardValidators.FILE_EXISTS_VALIDATOR).
- required(false).
- build();
- public static final PropertyDescriptor STRICT_HOST_KEY_CHECKING = new PropertyDescriptor.Builder().
- name("Strict Host Key Checking").
- description("Indicates whether or not strict enforcement of hosts keys should be applied").
- allowableValues("true", "false").
- defaultValue("false").
- required(true).
- build();
- public static final PropertyDescriptor PORT = new PropertyDescriptor.Builder().
- name("Port").
- description("The port that the remote system is listening on for file transfers").
- addValidator(StandardValidators.PORT_VALIDATOR).
- required(true).
- defaultValue("22").
- build();
- public static final PropertyDescriptor USE_KEEPALIVE_ON_TIMEOUT = new PropertyDescriptor.Builder().
- name("Send Keep Alive On Timeout").
- description("Indicates whether or not to send a single Keep Alive message when SSH socket times out").
- allowableValues("true", "false").
- defaultValue("true").
- required(true).
- build();
+ public static final PropertyDescriptor PRIVATE_KEY_PATH = new PropertyDescriptor.Builder()
+ .name("Private Key Path")
+ .description("The fully qualified path to the Private Key file")
+ .required(false)
+ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor PRIVATE_KEY_PASSPHRASE = new PropertyDescriptor.Builder()
+ .name("Private Key Passphrase")
+ .description("Password for the private key")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .sensitive(true)
+ .build();
+ public static final PropertyDescriptor HOST_KEY_FILE = new PropertyDescriptor.Builder()
+ .name("Host Key File")
+ .description("If supplied, the given file will be used as the Host Key; otherwise, no use host key file will be used")
+ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .required(false)
+ .build();
+ public static final PropertyDescriptor STRICT_HOST_KEY_CHECKING = new PropertyDescriptor.Builder()
+ .name("Strict Host Key Checking")
+ .description("Indicates whether or not strict enforcement of hosts keys should be applied")
+ .allowableValues("true", "false")
+ .defaultValue("false")
+ .required(true)
+ .build();
+ public static final PropertyDescriptor PORT = new PropertyDescriptor.Builder()
+ .name("Port")
+ .description("The port that the remote system is listening on for file transfers")
+ .addValidator(StandardValidators.PORT_VALIDATOR)
+ .required(true)
+ .defaultValue("22")
+ .build();
+ public static final PropertyDescriptor USE_KEEPALIVE_ON_TIMEOUT = new PropertyDescriptor.Builder()
+ .name("Send Keep Alive On Timeout")
+ .description("Indicates whether or not to send a single Keep Alive message when SSH socket times out")
+ .allowableValues("true", "false")
+ .defaultValue("true")
+ .required(true)
+ .build();
/**
- * Dynamic property which is used to decide if the
- * {@link #ensureDirectoryExists(FlowFile, File)} method should perform a
- * {@link ChannelSftp#ls(String)} before calling
- * {@link ChannelSftp#mkdir(String)}. In most cases, the code should call ls
- * before mkdir, but some weird permission setups (chmod 100) on a directory
- * would cause the 'ls' to throw a permission exception.
+ * Dynamic property which is used to decide if the {@link #ensureDirectoryExists(FlowFile, File)} method should perform a {@link ChannelSftp#ls(String)} before calling
+ * {@link ChannelSftp#mkdir(String)}. In most cases, the code should call ls before mkdir, but some weird permission setups (chmod 100) on a directory would cause the 'ls' to throw a permission
+ * exception.
* <p>
* This property is dynamic until deemed a worthy inclusion as proper.
*/
- public static final PropertyDescriptor DISABLE_DIRECTORY_LISTING = new PropertyDescriptor.Builder().
- name("Disable Directory Listing").
- description("Disables directory listings before operations which might fail, such as configurations which create directory structures.").
- addValidator(StandardValidators.BOOLEAN_VALIDATOR).
- dynamic(true).
- defaultValue("false").
- build();
+ public static final PropertyDescriptor DISABLE_DIRECTORY_LISTING = new PropertyDescriptor.Builder()
+ .name("Disable Directory Listing")
+ .description("Disables directory listings before operations which might fail, such as configurations which create directory structures.")
+ .addValidator(StandardValidators.BOOLEAN_VALIDATOR)
+ .dynamic(true)
+ .defaultValue("false")
+ .build();
private final ProcessorLog logger;
@@ -123,10 +120,8 @@ public class SFTPTransfer implements FileTransfer {
this.ctx = processContext;
this.logger = logger;
- final PropertyValue disableListing = processContext.
- getProperty(DISABLE_DIRECTORY_LISTING);
- disableDirectoryListing = disableListing == null ? false : Boolean.TRUE.
- equals(disableListing.asBoolean());
+ final PropertyValue disableListing = processContext.getProperty(DISABLE_DIRECTORY_LISTING);
+ disableDirectoryListing = disableListing == null ? false : Boolean.TRUE.equals(disableListing.asBoolean());
}
@Override
@@ -136,13 +131,9 @@ public class SFTPTransfer implements FileTransfer {
@Override
public List<FileInfo> getListing() throws IOException {
- final String path = ctx.getProperty(FileTransfer.REMOTE_PATH).
- evaluateAttributeExpressions().
- getValue();
+ final String path = ctx.getProperty(FileTransfer.REMOTE_PATH).evaluateAttributeExpressions().getValue();
final int depth = 0;
- final int maxResults = ctx.
- getProperty(FileTransfer.REMOTE_POLL_BATCH_SIZE).
- asInteger();
+ final int maxResults = ctx.getProperty(FileTransfer.REMOTE_POLL_BATCH_SIZE).asInteger();
final List<FileInfo> listing = new ArrayList<>(1000);
getListing(path, depth, maxResults, listing);
return listing;
@@ -154,43 +145,28 @@ public class SFTPTransfer implements FileTransfer {
}
if (depth >= 100) {
- logger.
- warn(this + " had to stop recursively searching directories at a recursive depth of " + depth + " to avoid memory issues");
+ logger.warn(this + " had to stop recursively searching directories at a recursive depth of " + depth + " to avoid memory issues");
return;
}
final boolean ignoreDottedFiles = ctx.
- getProperty(FileTransfer.IGNORE_DOTTED_FILES).
- asBoolean();
- final boolean recurse = ctx.getProperty(FileTransfer.RECURSIVE_SEARCH).
- asBoolean();
- final String fileFilterRegex = ctx.
- getProperty(FileTransfer.FILE_FILTER_REGEX).
- getValue();
- final Pattern pattern = (fileFilterRegex == null) ? null : Pattern.
- compile(fileFilterRegex);
- final String pathFilterRegex = ctx.
- getProperty(FileTransfer.PATH_FILTER_REGEX).
- getValue();
- final Pattern pathPattern = (!recurse || pathFilterRegex == null) ? null : Pattern.
- compile(pathFilterRegex);
- final String remotePath = ctx.getProperty(FileTransfer.REMOTE_PATH).
- evaluateAttributeExpressions().
- getValue();
+ getProperty(FileTransfer.IGNORE_DOTTED_FILES).asBoolean();
+ final boolean recurse = ctx.getProperty(FileTransfer.RECURSIVE_SEARCH).asBoolean();
+ final String fileFilterRegex = ctx.getProperty(FileTransfer.FILE_FILTER_REGEX).getValue();
+ final Pattern pattern = (fileFilterRegex == null) ? null : Pattern.compile(fileFilterRegex);
+ final String pathFilterRegex = ctx.getProperty(FileTransfer.PATH_FILTER_REGEX).getValue();
+ final Pattern pathPattern = (!recurse || pathFilterRegex == null) ? null : Pattern.compile(pathFilterRegex);
+ final String remotePath = ctx.getProperty(FileTransfer.REMOTE_PATH).evaluateAttributeExpressions().getValue();
// check if this directory path matches the PATH_FILTER_REGEX
boolean pathFilterMatches = true;
if (pathPattern != null) {
Path reldir = path == null ? Paths.get(".") : Paths.get(path);
if (remotePath != null) {
- reldir = Paths.get(remotePath).
- relativize(reldir);
- }
- if (reldir != null && !reldir.toString().
- isEmpty()) {
- if (!pathPattern.matcher(reldir.toString().
- replace("\\", "/")).
- matches()) {
+ reldir = Paths.get(remotePath).relativize(reldir);
+ }
+ if (reldir != null && !reldir.toString().isEmpty()) {
+ if (!pathPattern.matcher(reldir.toString().replace("\\", "/")).matches()) {
pathFilterMatches = false;
}
}
@@ -219,19 +195,15 @@ public class SFTPTransfer implements FileTransfer {
}
// if is a directory and we're supposed to recurse
- if (recurse && entry.getAttrs().
- isDir()) {
+ if (recurse && entry.getAttrs().isDir()) {
subDirs.add(entry);
return LsEntrySelector.CONTINUE;
}
// if is not a directory and is not a link and it matches
// FILE_FILTER_REGEX - then let's add it
- if (!entry.getAttrs().
- isDir() && !entry.getAttrs().
- isLink() && isPathMatch) {
- if (pattern == null || pattern.matcher(entryFilename).
- matches()) {
+ if (!entry.getAttrs().isDir() && !entry.getAttrs().isLink() && isPathMatch) {
+ if (pattern == null || pattern.matcher(entryFilename).matches()) {
listing.add(newFileInfo(entry, path));
}
}
@@ -245,8 +217,7 @@ public class SFTPTransfer implements FileTransfer {
};
- if (path == null || path.trim().
- isEmpty()) {
+ if (path == null || path.trim().isEmpty()) {
sftp.ls(".", filter);
} else {
sftp.ls(path, filter);
@@ -258,8 +229,7 @@ public class SFTPTransfer implements FileTransfer {
for (final LsEntry entry : subDirs) {
final String entryFilename = entry.getFilename();
final File newFullPath = new File(path, entryFilename);
- final String newFullForwardPath = newFullPath.getPath().
- replace("\\", "/");
+ final String newFullForwardPath = newFullPath.getPath().replace("\\", "/");
try {
getListing(newFullForwardPath, depth + 1, maxResults, listing);
@@ -275,29 +245,22 @@ public class SFTPTransfer implements FileTransfer {
return null;
}
final File newFullPath = new File(path, entry.getFilename());
- final String newFullForwardPath = newFullPath.getPath().
- replace("\\", "/");
+ final String newFullForwardPath = newFullPath.getPath().replace("\\", "/");
- String perms = entry.getAttrs().
- getPermissionsString();
+ String perms = entry.getAttrs().getPermissionsString();
if (perms.length() > 9) {
perms = perms.substring(perms.length() - 9);
}
FileInfo.Builder builder = new FileInfo.Builder()
- .filename(entry.getFilename()).
- fullPathFileName(newFullForwardPath).
- directory(entry.getAttrs().
- isDir()).
- size(entry.getAttrs().
- getSize()).
- lastModifiedTime(entry.getAttrs().
- getMTime() * 1000L).
- permissions(perms).
- owner(Integer.toString(entry.getAttrs().
- getUId())).
- group(Integer.toString(entry.getAttrs().
- getGId()));
+ .filename(entry.getFilename())
+ .fullPathFileName(newFullForwardPath)
+ .directory(entry.getAttrs().isDir())
+ .size(entry.getAttrs().getSize())
+ .lastModifiedTime(entry.getAttrs().getMTime() * 1000L)
+ .permissions(perms)
+ .owner(Integer.toString(entry.getAttrs().getUId()))
+ .group(Integer.toString(entry.getAttrs().getGId()));
return builder.build();
}
@@ -318,9 +281,7 @@ public class SFTPTransfer implements FileTransfer {
@Override
public void deleteFile(final String path, final String remoteFileName) throws IOException {
- final String fullPath = (path == null)
- ? remoteFileName
- : (path.endsWith("/")) ? path + remoteFileName : path + "/" + remoteFileName;
+ final String fullPath = (path == null) ? remoteFileName : (path.endsWith("/")) ? path + remoteFileName : path + "/" + remoteFileName;
try {
sftp.rm(fullPath);
} catch (final SftpException e) {
@@ -340,9 +301,7 @@ public class SFTPTransfer implements FileTransfer {
@Override
public void ensureDirectoryExists(final FlowFile flowFile, final File directoryName) throws IOException {
final ChannelSftp channel = getChannel(flowFile);
- final String remoteDirectory = directoryName.getAbsolutePath().
- replace("\\", "/").
- replaceAll("^.\\:", "");
+ final String remoteDirectory = directoryName.getAbsolutePath().replace("\\", "/").replaceAll("^.\\:", "");
// if we disable the directory listing, we just want to blindly perform the mkdir command,
// eating any exceptions thrown (like if the directory already exists).
@@ -374,13 +333,10 @@ public class SFTPTransfer implements FileTransfer {
if (!exists) {
// first ensure parent directories exist before creating this one
- if (directoryName.getParent() != null && !directoryName.
- getParentFile().
- equals(new File(File.separator))) {
+ if (directoryName.getParent() != null && !directoryName.getParentFile().equals(new File(File.separator))) {
ensureDirectoryExists(flowFile, directoryName.getParentFile());
}
- logger.
- debug("Remote Directory {} does not exist; creating it", new Object[]{remoteDirectory});
+ logger.debug("Remote Directory {} does not exist; creating it", new Object[]{remoteDirectory});
try {
channel.mkdir(remoteDirectory);
logger.debug("Created {}", new Object[]{remoteDirectory});
@@ -393,9 +349,7 @@ public class SFTPTransfer implements FileTransfer {
private ChannelSftp getChannel(final FlowFile flowFile) throws IOException {
if (sftp != null) {
String sessionhost = session.getHost();
- String desthost = ctx.getProperty(HOSTNAME).
- evaluateAttributeExpressions(flowFile).
- getValue();
+ String desthost = ctx.getProperty(HOSTNAME).evaluateAttributeExpressions(flowFile).getValue();
if (sessionhost.equals(desthost)) {
// destination matches so we can keep our current session
return sftp;
@@ -407,35 +361,22 @@ public class SFTPTransfer implements FileTransfer {
final JSch jsch = new JSch();
try {
- final Session session = jsch.getSession(ctx.getProperty(USERNAME).
- getValue(),
- ctx.getProperty(HOSTNAME).
- evaluateAttributeExpressions(flowFile).
- getValue(),
- ctx.getProperty(PORT).
- evaluateAttributeExpressions(flowFile).
- asInteger().
- intValue());
-
- final String hostKeyVal = ctx.getProperty(HOST_KEY_FILE).
- getValue();
+ final Session session = jsch.getSession(ctx.getProperty(USERNAME).getValue(),
+ ctx.getProperty(HOSTNAME).evaluateAttributeExpressions(flowFile).getValue(),
+ ctx.getProperty(PORT).evaluateAttributeExpressions(flowFile).asInteger().intValue());
+
+ final String hostKeyVal = ctx.getProperty(HOST_KEY_FILE).getValue();
if (hostKeyVal != null) {
jsch.setKnownHosts(hostKeyVal);
}
final Properties properties = new Properties();
- properties.setProperty("StrictHostKeyChecking", ctx.
- getProperty(STRICT_HOST_KEY_CHECKING).
- asBoolean() ? "yes" : "no");
- properties.
- setProperty("PreferredAuthentications", "publickey,password");
-
- if (ctx.getProperty(FileTransfer.USE_COMPRESSION).
- asBoolean()) {
- properties.
- setProperty("compression.s2c", "zlib@openssh.com,zlib,none");
- properties.
- setProperty("compression.c2s", "zlib@openssh.com,zlib,none");
+ properties.setProperty("StrictHostKeyChecking", ctx.getProperty(STRICT_HOST_KEY_CHECKING).asBoolean() ? "yes" : "no");
+ properties.setProperty("PreferredAuthentications", "publickey,password");
+
+ if (ctx.getProperty(FileTransfer.USE_COMPRESSION).asBoolean()) {
+ properties.setProperty("compression.s2c", "zlib@openssh.com,zlib,none");
+ properties.setProperty("compression.c2s", "zlib@openssh.com,zlib,none");
} else {
properties.setProperty("compression.s2c", "none");
properties.setProperty("compression.c2s", "none");
@@ -443,42 +384,32 @@ public class SFTPTransfer implements FileTransfer {
session.setConfig(properties);
- final String privateKeyFile = ctx.getProperty(PRIVATE_KEY_PATH).
- getValue();
+ final String privateKeyFile = ctx.getProperty(PRIVATE_KEY_PATH).getValue();
if (privateKeyFile != null) {
- jsch.addIdentity(privateKeyFile, ctx.
- getProperty(PRIVATE_KEY_PASSPHRASE).
- getValue());
+ jsch.addIdentity(privateKeyFile, ctx.getProperty(PRIVATE_KEY_PASSPHRASE).getValue());
}
- final String password = ctx.getProperty(FileTransfer.PASSWORD).
- getValue();
+ final String password = ctx.getProperty(FileTransfer.PASSWORD).getValue();
if (password != null) {
session.setPassword(password);
}
- session.setTimeout(ctx.getProperty(FileTransfer.CONNECTION_TIMEOUT).
- asTimePeriod(TimeUnit.MILLISECONDS).
- intValue());
+ session.setTimeout(ctx.getProperty(FileTransfer.CONNECTION_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue());
session.connect();
this.session = session;
this.closed = false;
sftp = (ChannelSftp) session.openChannel("sftp");
sftp.connect();
- session.setTimeout(ctx.getProperty(FileTransfer.DATA_TIMEOUT).
- asTimePeriod(TimeUnit.MILLISECONDS).
- intValue());
- if (!ctx.getProperty(USE_KEEPALIVE_ON_TIMEOUT).
- asBoolean()) {
+ session.setTimeout(ctx.getProperty(FileTransfer.DATA_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue());
+ if (!ctx.getProperty(USE_KEEPALIVE_ON_TIMEOUT).asBoolean()) {
session.setServerAliveCountMax(0); // do not send keepalive message on SocketTimeoutException
}
this.homeDir = sftp.getHome();
return sftp;
} catch (final SftpException | JSchException e) {
- throw new IOException("Failed to obtain connection to remote host due to " + e.
- toString(), e);
+ throw new IOException("Failed to obtain connection to remote host due to " + e.toString(), e);
}
}
@@ -500,9 +431,7 @@ public class SFTPTransfer implements FileTransfer {
sftp.exit();
}
} catch (final Exception ex) {
- logger.
- warn("Failed to close ChannelSftp due to {}", new Object[]{ex.
- toString()}, ex);
+ logger.warn("Failed to close ChannelSftp due to {}", new Object[]{ex.toString()}, ex);
}
sftp = null;
@@ -511,8 +440,7 @@ public class SFTPTransfer implements FileTransfer {
session.disconnect();
}
} catch (final Exception ex) {
- logger.warn("Failed to close session due to {}", new Object[]{ex.
- toString()}, ex);
+ logger.warn("Failed to close session due to {}", new Object[]{ex.toString()}, ex);
}
session = null;
}
@@ -552,8 +480,7 @@ public class SFTPTransfer implements FileTransfer {
LsEntry matchingEntry = null;
for (final LsEntry entry : vector) {
- if (entry.getFilename().
- equalsIgnoreCase(filename)) {
+ if (entry.getFilename().equalsIgnoreCase(filename)) {
matchingEntry = entry;
break;
}
@@ -567,22 +494,15 @@ public class SFTPTransfer implements FileTransfer {
final ChannelSftp sftp = getChannel(flowFile);
// destination path + filename
- final String fullPath = (path == null)
- ? filename
- : (path.endsWith("/")) ? path + filename : path + "/" + filename;
+ final String fullPath = (path == null) ? filename : (path.endsWith("/")) ? path + filename : path + "/" + filename;
// temporary path + filename
- String tempFilename = ctx.getProperty(TEMP_FILENAME).
- evaluateAttributeExpressions(flowFile).
- getValue();
+ String tempFilename = ctx.getProperty(TEMP_FILENAME).evaluateAttributeExpressions(flowFile).getValue();
if (tempFilename == null) {
- final boolean dotRename = ctx.getProperty(DOT_RENAME).
- asBoolean();
+ final boolean dotRename = ctx.getProperty(DOT_RENAME).asBoolean();
tempFilename = dotRename ? "." + filename : filename;
}
- final String tempPath = (path == null)
- ? tempFilename
- : (path.endsWith("/")) ? path + tempFilename : path + "/" + tempFilename;
+ final String tempPath = (path == null) ? tempFilename : (path.endsWith("/")) ? path + tempFilename : path + "/" + tempFilename;
try {
sftp.put(content, tempPath);
@@ -590,61 +510,45 @@ public class SFTPTransfer implements FileTransfer {
throw new IOException("Unable to put content to " + fullPath + " due to " + e, e);
}
- final String lastModifiedTime = ctx.getProperty(LAST_MODIFIED_TIME).
- evaluateAttributeExpressions(flowFile).
- getValue();
- if (lastModifiedTime != null && !lastModifiedTime.trim().
- isEmpty()) {
+ final String lastModifiedTime = ctx.getProperty(LAST_MODIFIED_TIME).evaluateAttributeExpressions(flowFile).getValue();
+ if (lastModifiedTime != null && !lastModifiedTime.trim().isEmpty()) {
try {
final DateFormat formatter = new SimpleDateFormat(FILE_MODIFY_DATE_ATTR_FORMAT, Locale.US);
final Date fileModifyTime = formatter.parse(lastModifiedTime);
int time = (int) (fileModifyTime.getTime() / 1000L);
sftp.setMtime(tempPath, time);
} catch (final Exception e) {
- logger.
- error("Failed to set lastModifiedTime on {} to {} due to {}", new Object[]{tempPath, lastModifiedTime, e});
+ logger.error("Failed to set lastModifiedTime on {} to {} due to {}", new Object[]{tempPath, lastModifiedTime, e});
}
}
- final String permissions = ctx.getProperty(PERMISSIONS).
- evaluateAttributeExpressions(flowFile).
- getValue();
- if (permissions != null && !permissions.trim().
- isEmpty()) {
+ final String permissions = ctx.getProperty(PERMISSIONS).evaluateAttributeExpressions(flowFile).getValue();
+ if (permissions != null && !permissions.trim().isEmpty()) {
try {
int perms = numberPermissions(permissions);
if (perms >= 0) {
sftp.chmod(perms, tempPath);
}
} catch (final Exception e) {
- logger.
- error("Failed to set permission on {} to {} due to {}", new Object[]{tempPath, permissions, e});
+ logger.error("Failed to set permission on {} to {} due to {}", new Object[]{tempPath, permissions, e});
}
}
- final String owner = ctx.getProperty(REMOTE_OWNER).
- evaluateAttributeExpressions(flowFile).
- getValue();
- if (owner != null && !owner.trim().
- isEmpty()) {
+ final String owner = ctx.getProperty(REMOTE_OWNER).evaluateAttributeExpressions(flowFile).getValue();
+ if (owner != null && !owner.trim().isEmpty()) {
try {
sftp.chown(Integer.parseInt(owner), tempPath);
} catch (final Exception e) {
- logger.
- error("Failed to set owner on {} to {} due to {}", new Object[]{tempPath, owner, e});
+ logger.error("Failed to set owner on {} to {} due to {}", new Object[]{tempPath, owner, e});
}
}
- final String group = ctx.getProperty(REMOTE_GROUP).
- evaluateAttributeExpressions(flowFile).
- getValue();
- if (group != null && !group.trim().
- isEmpty()) {
+ final String group = ctx.getProperty(REMOTE_GROUP).evaluateAttributeExpressions(flowFile).getValue();
+ if (group != null && !group.trim().isEmpty()) {
try {
sftp.chgrp(Integer.parseInt(group), tempPath);
} catch (final Exception e) {
- logger.
- error("Failed to set group on {} to {} due to {}", new Object[]{tempPath, group, e});
+ logger.error("Failed to set group on {} to {} due to {}", new Object[]{tempPath, group, e});
}
}
@@ -668,8 +572,7 @@ public class SFTPTransfer implements FileTransfer {
int number = -1;
final Pattern rwxPattern = Pattern.compile("^[rwx-]{9}$");
final Pattern numPattern = Pattern.compile("\\d+");
- if (rwxPattern.matcher(perms).
- matches()) {
+ if (rwxPattern.matcher(perms).matches()) {
number = 0;
if (perms.charAt(0) == 'r') {
number |= 0x100;
@@ -698,8 +601,7 @@ public class SFTPTransfer implements FileTransfer {
if (perms.charAt(8) == 'x') {
number |= 0x1;
}
- } else if (numPattern.matcher(perms).
- matches()) {
+ } else if (numPattern.matcher(perms).matches()) {
try {
number = Integer.parseInt(perms, 8);
} catch (NumberFormatException ignore) {
@@ -717,8 +619,7 @@ public class SFTPTransfer implements FileTransfer {
@Override
public void log(int level, String message) {
- LoggerFactory.getLogger(SFTPTransfer.class).
- debug("SFTP Log: {}", message);
+ LoggerFactory.getLogger(SFTPTransfer.class).debug("SFTP Log: {}", message);
}
});
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPUtils.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPUtils.java
index 9121089..fc6275f 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPUtils.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPUtils.java
@@ -40,80 +40,80 @@ import com.jcraft.jsch.SftpException;
public class SFTPUtils {
- public static final PropertyDescriptor SFTP_PRIVATEKEY_PATH = new PropertyDescriptor.Builder().
- required(false).
- description("sftp.privatekey.path").
- defaultValue(null).
- name("sftp.privatekey.path").
- addValidator(StandardValidators.FILE_EXISTS_VALIDATOR).
- sensitive(false).
- build();
- public static final PropertyDescriptor REMOTE_PASSWORD = new PropertyDescriptor.Builder().
- required(false).
- description("remote.password").
- defaultValue(null).
- name("remote.password").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- sensitive(true).
- build();
- public static final PropertyDescriptor SFTP_PRIVATEKEY_PASSPHRASE = new PropertyDescriptor.Builder().
- required(false).
- description("sftp.privatekey.passphrase").
- defaultValue(null).
- name("sftp.privatekey.passphrase").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- sensitive(true).
- build();
- public static final PropertyDescriptor SFTP_PORT = new PropertyDescriptor.Builder().
- required(false).
- description("sftp.port").
- defaultValue(null).
- name("sftp.port").
- addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR).
- sensitive(false).
- build();
- public static final PropertyDescriptor NETWORK_DATA_TIMEOUT = new PropertyDescriptor.Builder().
- required(false).
- description("network.data.timeout").
- defaultValue(null).
- name("network.data.timeout").
- addValidator(StandardValidators.INTEGER_VALIDATOR).
- sensitive(false).
- build();
- public static final PropertyDescriptor SFTP_HOSTKEY_FILENAME = new PropertyDescriptor.Builder().
- required(false).
- description("sftp.hostkey.filename").
- defaultValue(null).
- name("sftp.hostkey.filename").
- addValidator(StandardValidators.FILE_EXISTS_VALIDATOR).
- sensitive(false).
- build();
- public static final PropertyDescriptor NETWORK_CONNECTION_TIMEOUT = new PropertyDescriptor.Builder().
- required(false).
- description("network.connection.timeout").
- defaultValue(null).
- name("network.connection.timeout").
- addValidator(StandardValidators.INTEGER_VALIDATOR).
- sensitive(false).
- build();
+ public static final PropertyDescriptor SFTP_PRIVATEKEY_PATH = new PropertyDescriptor.Builder()
+ .required(false)
+ .description("sftp.privatekey.path")
+ .defaultValue(null)
+ .name("sftp.privatekey.path")
+ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .sensitive(false)
+ .build();
+ public static final PropertyDescriptor REMOTE_PASSWORD = new PropertyDescriptor.Builder()
+ .required(false)
+ .description("remote.password")
+ .defaultValue(null)
+ .name("remote.password")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .sensitive(true)
+ .build();
+ public static final PropertyDescriptor SFTP_PRIVATEKEY_PASSPHRASE = new PropertyDescriptor.Builder()
+ .required(false)
+ .description("sftp.privatekey.passphrase")
+ .defaultValue(null)
+ .name("sftp.privatekey.passphrase")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .sensitive(true)
+ .build();
+ public static final PropertyDescriptor SFTP_PORT = new PropertyDescriptor.Builder()
+ .required(false)
+ .description("sftp.port")
+ .defaultValue(null)
+ .name("sftp.port")
+ .addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR)
+ .sensitive(false)
+ .build();
+ public static final PropertyDescriptor NETWORK_DATA_TIMEOUT = new PropertyDescriptor.Builder()
+ .required(false)
+ .description("network.data.timeout")
+ .defaultValue(null)
+ .name("network.data.timeout")
+ .addValidator(StandardValidators.INTEGER_VALIDATOR)
+ .sensitive(false)
+ .build();
+ public static final PropertyDescriptor SFTP_HOSTKEY_FILENAME = new PropertyDescriptor.Builder()
+ .required(false)
+ .description("sftp.hostkey.filename")
+ .defaultValue(null)
+ .name("sftp.hostkey.filename")
+ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .sensitive(false)
+ .build();
+ public static final PropertyDescriptor NETWORK_CONNECTION_TIMEOUT = new PropertyDescriptor.Builder()
+ .required(false)
+ .description("network.connection.timeout")
+ .defaultValue(null)
+ .name("network.connection.timeout")
+ .addValidator(StandardValidators.INTEGER_VALIDATOR)
+ .sensitive(false)
+ .build();
// required properties
- public static final PropertyDescriptor REMOTE_HOSTNAME = new PropertyDescriptor.Builder().
- required(true).
- description("remote.hostname").
- defaultValue(null).
- name("remote.hostname").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- sensitive(false).
- build();
- public static final PropertyDescriptor REMOTE_USERNAME = new PropertyDescriptor.Builder().
- required(true).
- description("remote.username").
- defaultValue(null).
- name("remote.username").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- sensitive(false).
- build();
+ public static final PropertyDescriptor REMOTE_HOSTNAME = new PropertyDescriptor.Builder()
+ .required(true)
+ .description("remote.hostname")
+ .defaultValue(null)
+ .name("remote.hostname")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .sensitive(false)
+ .build();
+ public static final PropertyDescriptor REMOTE_USERNAME = new PropertyDescriptor.Builder()
+ .required(true)
+ .description("remote.username")
+ .defaultValue(null)
+ .name("remote.username")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .sensitive(false)
+ .build();
private static final List<PropertyDescriptor> propertyDescriptors = new ArrayList<>();
@@ -149,22 +149,16 @@ public class SFTPUtils {
File dir = new File(dirPath);
String currentWorkingDirectory = null;
boolean dirExists = false;
- final String forwardPaths = dir.getPath().
- replaceAll(Matcher.quoteReplacement("\\"), Matcher.
- quoteReplacement("/"));
+ final String forwardPaths = dir.getPath().replaceAll(Matcher.quoteReplacement("\\"), Matcher.quoteReplacement("/"));
try {
currentWorkingDirectory = sftp.pwd();
- logger.
- debug(proc + " attempting to change directory from " + currentWorkingDirectory + " to " + dir.
- getPath());
+ logger.debug(proc + " attempting to change directory from " + currentWorkingDirectory + " to " + dir.getPath());
//always use forward paths for long string attempt
sftp.cd(forwardPaths);
dirExists = true;
- logger.
- debug(proc + " changed working directory to '" + forwardPaths + "' from '" + currentWorkingDirectory + "'");
+ logger.debug(proc + " changed working directory to '" + forwardPaths + "' from '" + currentWorkingDirectory + "'");
} catch (final SftpException sftpe) {
- logger.
- debug(proc + " could not change directory to '" + forwardPaths + "' from '" + currentWorkingDirectory + "' so trying the hard way.");
+ logger.debug(proc + " could not change directory to '" + forwardPaths + "' from '" + currentWorkingDirectory + "' so trying the hard way.");
}
if (dirExists) {
return;
@@ -185,14 +179,12 @@ public class SFTPUtils {
try {
sftp.cd(dirName);
} catch (final SftpException sftpe) {
- logger.
- debug(proc + " creating new directory and changing to it " + dirName);
+ logger.debug(proc + " creating new directory and changing to it " + dirName);
try {
sftp.mkdir(dirName);
sftp.cd(dirName);
} catch (final SftpException e) {
- throw new IOException(proc + " could not make/change directory to [" + dirName + "] [" + e.
- getLocalizedMessage() + "]", e);
+ throw new IOException(proc + " could not make/change directory to [" + dirName + "] [" + e.getLocalizedMessage() + "]", e);
}
}
}
@@ -205,8 +197,7 @@ public class SFTPUtils {
final Hashtable<String, String> newOptions = new Hashtable<>();
- Session session = jsch.
- getSession(conf.username, conf.hostname, conf.port);
+ Session session = jsch.getSession(conf.username, conf.hostname, conf.port);
final String hostKeyVal = conf.hostkeyFile;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
index 84f431d..ad2cca5 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
@@ -109,8 +109,7 @@ public class UDPStreamConsumer implements StreamConsumer {
}
// time to make a new flow file
newFlowFile = session.create();
- newFlowFile = session.
- putAttribute(newFlowFile, "source.stream.identifier", uniqueId);
+ newFlowFile = session.putAttribute(newFlowFile, "source.stream.identifier", uniqueId);
newFlowFile = session.write(newFlowFile, udpCallback);
if (newFlowFile.getSize() == 0) {
session.remove(newFlowFile);
@@ -123,8 +122,7 @@ public class UDPStreamConsumer implements StreamConsumer {
try {
session.remove(newFlowFile);
} catch (final Exception ex2) {
- logger.
- warn("Unable to delete partial flow file due to: ", ex2);
+ logger.warn("Unable to delete partial flow file due to: ", ex2);
}
}
throw new IOException("Problem while processing data stream", ex);
@@ -158,21 +156,17 @@ public class UDPStreamConsumer implements StreamConsumer {
return false;
}
UDPStreamConsumer rhs = (UDPStreamConsumer) obj;
- return new EqualsBuilder().appendSuper(super.equals(obj)).
- append(uniqueId, rhs.uniqueId).
- isEquals();
+ return new EqualsBuilder().appendSuper(super.equals(obj)).append(uniqueId, rhs.uniqueId).isEquals();
}
@Override
public final int hashCode() {
- return new HashCodeBuilder(17, 37).append(uniqueId).
- toHashCode();
+ return new HashCodeBuilder(17, 37).append(uniqueId).toHashCode();
}
@Override
public final String toString() {
- return new ToStringBuilder(this).append(uniqueId).
- toString();
+ return new ToStringBuilder(this).append(uniqueId).toString();
}
public static final class UDPConsumerCallback implements OutputStreamCallback {
@@ -194,11 +188,9 @@ public class UDPStreamConsumer implements StreamConsumer {
public void process(final OutputStream out) throws IOException {
try {
long totalBytes = 0L;
- try (WritableByteChannel wbc = Channels.
- newChannel(new BufferedOutputStream(out))) {
+ try (WritableByteChannel wbc = Channels.newChannel(new BufferedOutputStream(out))) {
ByteBuffer buffer = null;
- while ((buffer = filledBuffers.
- poll(50, TimeUnit.MILLISECONDS)) != null) {
+ while ((buffer = filledBuffers.poll(50, TimeUnit.MILLISECONDS)) != null) {
int bytesWrittenThisPass = 0;
try {
while (buffer.hasRemaining()) {
@@ -209,8 +201,7 @@ public class UDPStreamConsumer implements StreamConsumer {
break;// this is enough data
}
} finally {
- bufferPool.
- returnBuffer(buffer, bytesWrittenThisPass);
+ bufferPool.returnBuffer(buffer, bytesWrittenThisPass);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase32InputStream.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase32InputStream.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase32InputStream.java
index 692947d..711efce 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase32InputStream.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase32InputStream.java
@@ -23,8 +23,7 @@ import java.util.Arrays;
import org.apache.commons.codec.binary.Base32;
/**
- * An InputStream that throws an IOException if any byte is read that is not a
- * valid Base32 character. Whitespace is considered valid.
+ * An InputStream that throws an IOException if any byte is read that is not a valid Base32 character. Whitespace is considered valid.
*/
public class ValidatingBase32InputStream extends FilterInputStream {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase64InputStream.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase64InputStream.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase64InputStream.java
index 6867681..5002906 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase64InputStream.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/ValidatingBase64InputStream.java
@@ -24,8 +24,7 @@ import java.util.Arrays;
import org.apache.commons.codec.binary.Base64;
/**
- * An InputStream that throws an IOException if any byte is read that is not a
- * valid Base64 character. Whitespace is considered valid.
+ * An InputStream that throws an IOException if any byte is read that is not a valid Base64 character. Whitespace is considered valid.
*/
public class ValidatingBase64InputStream extends FilterInputStream {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageConsumer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageConsumer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageConsumer.java
index 7d16b73..fca6a70 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageConsumer.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageConsumer.java
@@ -55,22 +55,19 @@ public class WrappedMessageConsumer {
try {
connection.close();
} catch (final JMSException e) {
- logger.
- warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
+ logger.warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
}
try {
session.close();
} catch (final JMSException e) {
- logger.
- warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
+ logger.warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
}
try {
consumer.close();
} catch (final JMSException e) {
- logger.
- warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
+ logger.warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageProducer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageProducer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageProducer.java
index a2d7459..fc01b02 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageProducer.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/WrappedMessageProducer.java
@@ -55,22 +55,19 @@ public class WrappedMessageProducer {
try {
connection.close();
} catch (final JMSException e) {
- logger.
- warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
+ logger.warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
}
try {
session.close();
} catch (final JMSException e) {
- logger.
- warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
+ logger.warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
}
try {
producer.close();
} catch (final JMSException e) {
- logger.
- warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
+ logger.warn("unable to close connection to JMS Server due to {}; resources may not be cleaned up appropriately", e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/TestIngestAndUpdate.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/TestIngestAndUpdate.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/TestIngestAndUpdate.java
index 70f2579..c9ed9f9 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/TestIngestAndUpdate.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/TestIngestAndUpdate.java
@@ -21,8 +21,7 @@ public class TestIngestAndUpdate {
public static void main(String[] args) throws IOException {
byte[] bytes = new byte[1024];
- System.out.write(System.getProperty("user.dir").
- getBytes());
+ System.out.write(System.getProperty("user.dir").getBytes());
System.out.println(":ModifiedResult");
int numRead = 0;
while ((numRead = System.in.read(bytes)) != -1) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/CaptureServlet.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/CaptureServlet.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/CaptureServlet.java
index 772ca0b..d6c87d6 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/CaptureServlet.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/CaptureServlet.java
@@ -48,8 +48,7 @@ public class CaptureServlet extends HttpServlet {
@Override
protected void doHead(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
- response.
- setHeader("Accept", "application/flowfile-v3,application/flowfile-v2");
+ response.setHeader("Accept", "application/flowfile-v3,application/flowfile-v2");
response.setHeader("x-nifi-transfer-protocol-version", "1");
response.setHeader("Accept-Encoding", "gzip");
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/RESTServiceContentModified.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/RESTServiceContentModified.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/RESTServiceContentModified.java
index 580450f..ec3211c 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/RESTServiceContentModified.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/RESTServiceContentModified.java
@@ -47,11 +47,9 @@ public class RESTServiceContentModified extends HttpServlet {
dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
response.setContentType("application/json");
- if (ifNoneMatch != null && ifNoneMatch.length() > 0 && !IGNORE_ETAG && Integer.
- parseInt(ifNoneMatch) == ETAG) {
+ if (ifNoneMatch != null && ifNoneMatch.length() > 0 && !IGNORE_ETAG && Integer.parseInt(ifNoneMatch) == ETAG) {
response.setStatus(304);
- response.setHeader("Last-Modified", dateFormat.
- format(modificationDate));
+ response.setHeader("Last-Modified", dateFormat.format(modificationDate));
response.setHeader("ETag", Integer.toString(ETAG));
return;
}
@@ -59,16 +57,14 @@ public class RESTServiceContentModified extends HttpServlet {
long date = -1;
if (ifModifiedSince != null && ifModifiedSince.length() > 0 && !IGNORE_LAST_MODIFIED) {
try {
- date = dateFormat.parse(ifModifiedSince).
- getTime();
+ date = dateFormat.parse(ifModifiedSince).getTime();
} catch (Exception e) {
}
}
if (date >= modificationDate) {
response.setStatus(304);
- response.setHeader("Last-Modified", dateFormat.
- format(modificationDate));
+ response.setHeader("Last-Modified", dateFormat.format(modificationDate));
response.setHeader("ETag", Integer.toString(ETAG));
return;
}
@@ -76,8 +72,7 @@ public class RESTServiceContentModified extends HttpServlet {
response.setStatus(200);
response.setHeader("Last-Modified", dateFormat.format(modificationDate));
response.setHeader("ETag", Integer.toString(ETAG));
- response.getOutputStream().
- println(result);
+ response.getOutputStream().println(result);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestBase64EncodeContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestBase64EncodeContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestBase64EncodeContent.java
index 4005db7..eef4dbc 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestBase64EncodeContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestBase64EncodeContent.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.Base64EncodeContent;
import java.io.File;
import java.io.IOException;
import java.nio.file.Paths;
@@ -31,68 +30,53 @@ public class TestBase64EncodeContent {
@Test
public void testRoundTrip() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new Base64EncodeContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new Base64EncodeContent());
- testRunner.
- setProperty(Base64EncodeContent.MODE, Base64EncodeContent.ENCODE_MODE);
+ testRunner.setProperty(Base64EncodeContent.MODE, Base64EncodeContent.ENCODE_MODE);
testRunner.enqueue(Paths.get("src/test/resources/hello.txt"));
testRunner.clearTransferState();
testRunner.run();
- testRunner.
- assertAllFlowFilesTransferred(Base64EncodeContent.REL_SUCCESS, 1);
+ testRunner.assertAllFlowFilesTransferred(Base64EncodeContent.REL_SUCCESS, 1);
- MockFlowFile flowFile = testRunner.
- getFlowFilesForRelationship(Base64EncodeContent.REL_SUCCESS).
- get(0);
+ MockFlowFile flowFile = testRunner.getFlowFilesForRelationship(Base64EncodeContent.REL_SUCCESS).get(0);
testRunner.assertQueueEmpty();
- testRunner.
- setProperty(Base64EncodeContent.MODE, Base64EncodeContent.DECODE_MODE);
+ testRunner.setProperty(Base64EncodeContent.MODE, Base64EncodeContent.DECODE_MODE);
testRunner.enqueue(flowFile);
testRunner.clearTransferState();
testRunner.run();
- testRunner.
- assertAllFlowFilesTransferred(Base64EncodeContent.REL_SUCCESS, 1);
+ testRunner.assertAllFlowFilesTransferred(Base64EncodeContent.REL_SUCCESS, 1);
- flowFile = testRunner.
- getFlowFilesForRelationship(Base64EncodeContent.REL_SUCCESS).
- get(0);
+ flowFile = testRunner.getFlowFilesForRelationship(Base64EncodeContent.REL_SUCCESS).get(0);
flowFile.assertContentEquals(new File("src/test/resources/hello.txt"));
}
@Test
public void testFailDecodeNotBase64() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new Base64EncodeContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new Base64EncodeContent());
- testRunner.
- setProperty(Base64EncodeContent.MODE, Base64EncodeContent.DECODE_MODE);
+ testRunner.setProperty(Base64EncodeContent.MODE, Base64EncodeContent.DECODE_MODE);
testRunner.enqueue(Paths.get("src/test/resources/hello.txt"));
testRunner.clearTransferState();
testRunner.run();
- testRunner.
- assertAllFlowFilesTransferred(Base64EncodeContent.REL_FAILURE, 1);
+ testRunner.assertAllFlowFilesTransferred(Base64EncodeContent.REL_FAILURE, 1);
}
@Test
public void testFailDecodeNotBase64ButIsAMultipleOfFourBytes() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new Base64EncodeContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new Base64EncodeContent());
- testRunner.
- setProperty(Base64EncodeContent.MODE, Base64EncodeContent.DECODE_MODE);
+ testRunner.setProperty(Base64EncodeContent.MODE, Base64EncodeContent.DECODE_MODE);
testRunner.enqueue("four@@@@multiple".getBytes());
testRunner.clearTransferState();
testRunner.run();
- testRunner.
- assertAllFlowFilesTransferred(Base64EncodeContent.REL_FAILURE, 1);
+ testRunner.assertAllFlowFilesTransferred(Base64EncodeContent.REL_FAILURE, 1);
}
}
[04/12] incubator-nifi git commit: NIFI-271
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java
index 8b9b2ac..6012b04 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java
@@ -44,15 +44,13 @@ public class TestHandleHttpRequest {
@Test
public void testRequestAddedToService() throws InitializationException, MalformedURLException, IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(HandleHttpRequest.class);
+ final TestRunner runner = TestRunners.newTestRunner(HandleHttpRequest.class);
runner.setProperty(HandleHttpRequest.PORT, "0");
final MockHttpContextMap contextMap = new MockHttpContextMap();
runner.addControllerService("http-context-map", contextMap);
runner.enableControllerService(contextMap);
- runner.
- setProperty(HandleHttpRequest.HTTP_CONTEXT_MAP, "http-context-map");
+ runner.setProperty(HandleHttpRequest.HTTP_CONTEXT_MAP, "http-context-map");
// trigger processor to stop but not shutdown.
runner.run(1, false);
@@ -61,8 +59,7 @@ public class TestHandleHttpRequest {
@Override
public void run() {
try {
- final int port = ((HandleHttpRequest) runner.
- getProcessor()).getPort();
+ final int port = ((HandleHttpRequest) runner.getProcessor()).getPort();
final HttpURLConnection connection = (HttpURLConnection) new URL("http://localhost:" + port + "/my/path?query=true&value1=value1&value2=&value3&value4=apple=orange").
openConnection();
connection.setDoOutput(false);
@@ -73,8 +70,7 @@ public class TestHandleHttpRequest {
connection.setConnectTimeout(3000);
connection.setReadTimeout(3000);
- StreamUtils.
- copy(connection.getInputStream(), new NullOutputStream());
+ StreamUtils.copy(connection.getInputStream(), new NullOutputStream());
} catch (final Throwable t) {
t.printStackTrace();
Assert.fail(t.toString());
@@ -92,13 +88,10 @@ public class TestHandleHttpRequest {
// process the request.
runner.run(1, false);
- runner.
- assertAllFlowFilesTransferred(HandleHttpRequest.REL_SUCCESS, 1);
+ runner.assertAllFlowFilesTransferred(HandleHttpRequest.REL_SUCCESS, 1);
assertEquals(1, contextMap.size());
- final MockFlowFile mff = runner.
- getFlowFilesForRelationship(HandleHttpRequest.REL_SUCCESS).
- get(0);
+ final MockFlowFile mff = runner.getFlowFilesForRelationship(HandleHttpRequest.REL_SUCCESS).get(0);
mff.assertAttributeEquals("http.query.param.query", "true");
mff.assertAttributeEquals("http.query.param.value1", "value1");
mff.assertAttributeEquals("http.query.param.value2", "");
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
index 40683ae..2bceda6 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpResponse.java
@@ -51,14 +51,12 @@ public class TestHandleHttpResponse {
@Test
public void testEnsureCompleted() throws InitializationException {
- final TestRunner runner = TestRunners.
- newTestRunner(HandleHttpResponse.class);
+ final TestRunner runner = TestRunners.newTestRunner(HandleHttpResponse.class);
final MockHttpContextMap contextMap = new MockHttpContextMap("my-id");
runner.addControllerService("http-context-map", contextMap);
runner.enableControllerService(contextMap);
- runner.
- setProperty(HandleHttpResponse.HTTP_CONTEXT_MAP, "http-context-map");
+ runner.setProperty(HandleHttpResponse.HTTP_CONTEXT_MAP, "http-context-map");
runner.setProperty(HandleHttpResponse.STATUS_CODE, "${status.code}");
runner.setProperty("my-attr", "${my-attr}");
runner.setProperty("no-valid-attr", "${no-valid-attr}");
@@ -104,47 +102,42 @@ public class TestHandleHttpResponse {
@Override
public HttpServletResponse getResponse(final String identifier) {
if (!id.equals(identifier)) {
- Assert.
- fail("attempting to respond to wrong request; should have been " + id + " but was " + identifier);
+ Assert.fail("attempting to respond to wrong request; should have been " + id + " but was " + identifier);
}
try {
- final HttpServletResponse response = Mockito.
- mock(HttpServletResponse.class);
- Mockito.when(response.getOutputStream()).
- thenReturn(new ServletOutputStream() {
- @Override
- public boolean isReady() {
- return true;
- }
-
- @Override
- public void setWriteListener(WriteListener writeListener) {
- }
-
- @Override
- public void write(int b) throws IOException {
- baos.write(b);
- }
-
- @Override
- public void write(byte[] b) throws IOException {
- baos.write(b);
- }
-
- @Override
- public void write(byte[] b, int off, int len) throws IOException {
- baos.write(b, off, len);
- }
- });
+ final HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
+ Mockito.when(response.getOutputStream()).thenReturn(new ServletOutputStream() {
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListener) {
+ }
+
+ @Override
+ public void write(int b) throws IOException {
+ baos.write(b);
+ }
+
+ @Override
+ public void write(byte[] b) throws IOException {
+ baos.write(b);
+ }
+
+ @Override
+ public void write(byte[] b, int off, int len) throws IOException {
+ baos.write(b, off, len);
+ }
+ });
Mockito.doAnswer(new Answer<Object>() {
@Override
public Object answer(final InvocationOnMock invocation) throws Throwable {
- final String key = invocation.
- getArgumentAt(0, String.class);
- final String value = invocation.
- getArgumentAt(1, String.class);
+ final String key = invocation.getArgumentAt(0, String.class);
+ final String value = invocation.getArgumentAt(1, String.class);
if (value == null) {
headersWithNoValue.add(key);
} else {
@@ -153,10 +146,7 @@ public class TestHandleHttpResponse {
return null;
}
- }).
- when(response).
- setHeader(Mockito.any(String.class), Mockito.
- any(String.class));
+ }).when(response).setHeader(Mockito.any(String.class), Mockito.any(String.class));
Mockito.doAnswer(new Answer<Object>() {
@Override
@@ -164,9 +154,7 @@ public class TestHandleHttpResponse {
statusCode = invocation.getArgumentAt(0, int.class);
return null;
}
- }).
- when(response).
- setStatus(Mockito.anyInt());
+ }).when(response).setStatus(Mockito.anyInt());
return response;
} catch (final Exception e) {
@@ -179,8 +167,7 @@ public class TestHandleHttpResponse {
@Override
public void complete(final String identifier) {
if (!id.equals(identifier)) {
- Assert.
- fail("attempting to respond to wrong request; should have been " + id + " but was " + identifier);
+ Assert.fail("attempting to respond to wrong request; should have been " + id + " but was " + identifier);
}
completedCount.incrementAndGet();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashAttribute.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashAttribute.java
index a57f6cf..7426e9e 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashAttribute.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashAttribute.java
@@ -36,8 +36,7 @@ public class TestHashAttribute {
@Test
public void test() {
final TestRunner runner = TestRunners.newTestRunner(new HashAttribute());
- runner.
- setProperty(HashAttribute.HASH_VALUE_ATTRIBUTE.getName(), "hashValue");
+ runner.setProperty(HashAttribute.HASH_VALUE_ATTRIBUTE.getName(), "hashValue");
runner.setProperty("MDKey1", ".*");
runner.setProperty("MDKey2", "(.).*");
@@ -67,9 +66,8 @@ public class TestHashAttribute {
runner.assertTransferCount(HashAttribute.REL_FAILURE, 1);
runner.assertTransferCount(HashAttribute.REL_SUCCESS, 4);
- final List<MockFlowFile> success = runner.
- getFlowFilesForRelationship(HashAttribute.REL_SUCCESS);
- final Map<String, Integer> correlationCount = new HashMap<String, Integer>();
+ final List<MockFlowFile> success = runner.getFlowFilesForRelationship(HashAttribute.REL_SUCCESS);
+ final Map<String, Integer> correlationCount = new HashMap<>();
for (final MockFlowFile flowFile : success) {
final String correlationId = flowFile.getAttribute("hashValue");
assertNotNull(correlationId);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashContent.java
index 8f6f5f4..d14683c 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHashContent.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.HashContent;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
@@ -59,9 +58,7 @@ public class TestHashContent {
runner.assertQueueEmpty();
runner.assertAllFlowFilesTransferred(HashContent.REL_SUCCESS, 1);
- final MockFlowFile outFile = runner.
- getFlowFilesForRelationship(HashContent.REL_SUCCESS).
- get(0);
+ final MockFlowFile outFile = runner.getFlowFilesForRelationship(HashContent.REL_SUCCESS).get(0);
final String hashValue = outFile.getAttribute("hash");
assertEquals(expectedHash, hashValue);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java
index 9f49476..0094cb0 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.IdentifyMimeType;
import static org.junit.Assert.assertEquals;
import java.io.File;
@@ -36,8 +35,7 @@ public class TestIdentifyMimeType {
@Test
public void testFiles() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new IdentifyMimeType());
+ final TestRunner runner = TestRunners.newTestRunner(new IdentifyMimeType());
final File dir = new File("src/test/resources/TestIdentifyMimeType");
final File[] files = dir.listFiles();
@@ -54,8 +52,7 @@ public class TestIdentifyMimeType {
runner.setThreadCount(1);
runner.run(fileCount);
- runner.
- assertAllFlowFilesTransferred(IdentifyMimeType.REL_SUCCESS, fileCount);
+ runner.assertAllFlowFilesTransferred(IdentifyMimeType.REL_SUCCESS, fileCount);
final Map<String, String> expectedMimeTypes = new HashMap<>();
expectedMimeTypes.put("1.7z", "application/x-7z-compressed");
@@ -93,13 +90,10 @@ public class TestIdentifyMimeType {
expectedExtensions.put("flowfilev3", "");
expectedExtensions.put("flowfilev1.tar", "");
- final List<MockFlowFile> filesOut = runner.
- getFlowFilesForRelationship(IdentifyMimeType.REL_SUCCESS);
+ final List<MockFlowFile> filesOut = runner.getFlowFilesForRelationship(IdentifyMimeType.REL_SUCCESS);
for (final MockFlowFile file : filesOut) {
- final String filename = file.getAttribute(CoreAttributes.FILENAME.
- key());
- final String mimeType = file.getAttribute(CoreAttributes.MIME_TYPE.
- key());
+ final String filename = file.getAttribute(CoreAttributes.FILENAME.key());
+ final String mimeType = file.getAttribute(CoreAttributes.MIME_TYPE.key());
final String expected = expectedMimeTypes.get(filename);
final String extension = file.getAttribute("mime.extension");
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
index 03fd14b..2f8dea9 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
@@ -145,9 +145,7 @@ public class TestInvokeHTTP {
//expected in request status.code and status.message
//original flow file (+attributes)??????????
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(Config.REL_SUCCESS_REQ).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(Config.REL_SUCCESS_REQ).get(0);
bundle.assertAttributeEquals(Config.STATUS_CODE, "200");
bundle.assertAttributeEquals(Config.STATUS_MESSAGE, "OK");
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
@@ -159,15 +157,12 @@ public class TestInvokeHTTP {
//status code, status message, all headers from server response --> ff attributes
//server response message body into payload of ff
//should not contain any original ff attributes
- final MockFlowFile bundle1 = runner.
- getFlowFilesForRelationship(Config.REL_SUCCESS_RESP).
- get(0);
+ final MockFlowFile bundle1 = runner.getFlowFilesForRelationship(Config.REL_SUCCESS_RESP).get(0);
bundle1.assertContentEquals("/status/200".getBytes("UTF-8"));
bundle1.assertAttributeEquals(Config.STATUS_CODE, "200");
bundle1.assertAttributeEquals(Config.STATUS_MESSAGE, "OK");
bundle1.assertAttributeEquals("Foo", "Bar");
- bundle1.
- assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
+ bundle1.assertAttributeEquals("Content-Type", "text/plain; charset=ISO-8859-1");
final String actual1 = new String(bundle1.toByteArray(), StandardCharsets.UTF_8);
final String expected1 = "/status/200";
Assert.assertEquals(expected1, actual1);
@@ -190,9 +185,7 @@ public class TestInvokeHTTP {
runner.assertTransferCount(Config.REL_FAILURE, 0);
//expected in response
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(Config.REL_RETRY).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(Config.REL_RETRY).get(0);
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
bundle.assertAttributeEquals(Config.STATUS_CODE, "500");
bundle.assertAttributeEquals(Config.STATUS_MESSAGE, "Server Error");
@@ -220,9 +213,7 @@ public class TestInvokeHTTP {
runner.assertTransferCount(Config.REL_FAILURE, 0);
//getMyFlowFiles();
//expected in response
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(Config.REL_NO_RETRY).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(Config.REL_NO_RETRY).get(0);
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
bundle.assertAttributeEquals(Config.STATUS_CODE, "302");
@@ -249,9 +240,7 @@ public class TestInvokeHTTP {
runner.assertTransferCount(Config.REL_FAILURE, 0);
//getMyFlowFiles();
//expected in response
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(Config.REL_NO_RETRY).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(Config.REL_NO_RETRY).get(0);
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
bundle.assertAttributeEquals(Config.STATUS_CODE, "304");
@@ -278,9 +267,7 @@ public class TestInvokeHTTP {
runner.assertTransferCount(Config.REL_FAILURE, 0);
//getMyFlowFiles();
//expected in response
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(Config.REL_NO_RETRY).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(Config.REL_NO_RETRY).get(0);
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
bundle.assertAttributeEquals(Config.STATUS_CODE, "400");
@@ -309,14 +296,11 @@ public class TestInvokeHTTP {
runner.assertTransferCount(Config.REL_FAILURE, 0);
//expected in response
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(Config.REL_NO_RETRY).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(Config.REL_NO_RETRY).get(0);
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
bundle.assertAttributeEquals(Config.STATUS_CODE, "412");
- bundle.
- assertAttributeEquals(Config.STATUS_MESSAGE, "Precondition Failed");
+ bundle.assertAttributeEquals(Config.STATUS_MESSAGE, "Precondition Failed");
bundle.assertAttributeEquals(Config.RESPONSE_BODY, "/status/412");
final String expected = "Hello";
Assert.assertEquals(expected, actual);
@@ -340,9 +324,7 @@ public class TestInvokeHTTP {
runner.assertTransferCount(Config.REL_NO_RETRY, 0);
runner.assertTransferCount(Config.REL_FAILURE, 0);
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(Config.REL_SUCCESS_REQ).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(Config.REL_SUCCESS_REQ).get(0);
bundle.assertAttributeEquals(Config.STATUS_CODE, "200");
bundle.assertAttributeEquals(Config.STATUS_MESSAGE, "OK");
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
@@ -350,9 +332,7 @@ public class TestInvokeHTTP {
Assert.assertEquals(expected, actual);
bundle.assertAttributeEquals("Foo", "Bar");
- final MockFlowFile bundle1 = runner.
- getFlowFilesForRelationship(Config.REL_SUCCESS_RESP).
- get(0);
+ final MockFlowFile bundle1 = runner.getFlowFilesForRelationship(Config.REL_SUCCESS_RESP).get(0);
bundle1.assertContentEquals("".getBytes("UTF-8"));
bundle1.assertAttributeEquals(Config.STATUS_CODE, "200");
bundle1.assertAttributeEquals(Config.STATUS_MESSAGE, "OK");
@@ -379,9 +359,7 @@ public class TestInvokeHTTP {
runner.assertTransferCount(Config.REL_NO_RETRY, 0);
runner.assertTransferCount(Config.REL_FAILURE, 0);
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(Config.REL_SUCCESS_REQ).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(Config.REL_SUCCESS_REQ).get(0);
bundle.assertAttributeEquals(Config.STATUS_CODE, "200");
bundle.assertAttributeEquals(Config.STATUS_MESSAGE, "OK");
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
@@ -389,9 +367,7 @@ public class TestInvokeHTTP {
Assert.assertEquals(expected, actual);
bundle.assertAttributeEquals("Foo", "Bar");
- final MockFlowFile bundle1 = runner.
- getFlowFilesForRelationship(Config.REL_SUCCESS_RESP).
- get(0);
+ final MockFlowFile bundle1 = runner.getFlowFilesForRelationship(Config.REL_SUCCESS_RESP).get(0);
bundle1.assertContentEquals("".getBytes("UTF-8"));
bundle1.assertAttributeEquals(Config.STATUS_CODE, "200");
bundle1.assertAttributeEquals(Config.STATUS_MESSAGE, "OK");
@@ -419,9 +395,7 @@ public class TestInvokeHTTP {
runner.assertTransferCount(Config.REL_NO_RETRY, 0);
runner.assertTransferCount(Config.REL_FAILURE, 0);
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(Config.REL_SUCCESS_REQ).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(Config.REL_SUCCESS_REQ).get(0);
bundle.assertAttributeEquals(Config.STATUS_CODE, "200");
bundle.assertAttributeEquals(Config.STATUS_MESSAGE, "OK");
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
@@ -429,9 +403,7 @@ public class TestInvokeHTTP {
Assert.assertEquals(expected, actual);
bundle.assertAttributeEquals("Foo", "Bar");
- final MockFlowFile bundle1 = runner.
- getFlowFilesForRelationship(Config.REL_SUCCESS_RESP).
- get(0);
+ final MockFlowFile bundle1 = runner.getFlowFilesForRelationship(Config.REL_SUCCESS_RESP).get(0);
bundle1.assertContentEquals("".getBytes("UTF-8"));
bundle1.assertAttributeEquals(Config.STATUS_CODE, "200");
bundle1.assertAttributeEquals(Config.STATUS_MESSAGE, "OK");
@@ -460,9 +432,7 @@ public class TestInvokeHTTP {
runner.assertTransferCount(Config.REL_NO_RETRY, 0);
runner.assertTransferCount(Config.REL_FAILURE, 1);
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(Config.REL_FAILURE).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(Config.REL_FAILURE).get(0);
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
final String expected = "Hello";
@@ -470,54 +440,6 @@ public class TestInvokeHTTP {
bundle.assertAttributeEquals("Foo", "Bar");
}
- // @Test
- // public void testGetFlowfileAttributes() throws IOException {
- // Map<String, List<String>> input = new HashMap<>();
- // input.put("A", Arrays.asList("1"));
- // input.put("B", Arrays.asList("1", "2", "3"));
- // input.put("C", new ArrayList<String>());
- // input.put("D", null);
- //
- // Map<String, String> expected = new HashMap<>();
- // expected.put(Config.STATUS_CODE, "200");
- // expected.put(Config.STATUS_MESSAGE, "OK");
- // expected.put(Config.STATUS_LINE, "HTTP/1.1 200 OK");
- // expected.put("A", "1");
- // expected.put("B", "1, 2, 3");
- //
- // URL url = new URL("file:/dev/null");
- // HttpURLConnection conn = new MockHttpURLConnection(url, 200, "OK", input);
- //
- // Map<String, String> actual = processor.getAttributesFromHeaders(conn);
- //
- // assertEquals(expected, actual);
- // }
- // @Test
- // public void testCsv() {
- // // null input should return an empty string
- // assertEquals("", processor.csv(null));
- //
- // // empty collection returns empty string
- // assertEquals("", processor.csv(new ArrayList<String>()));
- //
- // // pretty normal checks
- // assertEquals("1", processor.csv(Arrays.asList("1")));
- // assertEquals("1, 2", processor.csv(Arrays.asList("1", "2")));
- // assertEquals("1, 2, 3", processor.csv(Arrays.asList("1", "2", "3")));
- //
- // // values should be trimmed
- // assertEquals("1, 2, 3", processor.csv(Arrays.asList(" 1", " 2 ", "3 ")));
- //
- // // empty values should be skipped
- // assertEquals("1, 3", processor.csv(Arrays.asList("1", "", "3")));
- //
- // // whitespace values should be skipped
- // assertEquals("1, 3", processor.csv(Arrays.asList("1", " ", "3")));
- //
- // // this (mis)behavior is currently expected, embedded comma delimiters are not escaped
- // // note the embedded unescaped comma in the "1, " value
- // assertEquals("1,, 2, 3", processor.csv(Arrays.asList("1, ", "2", "3")));
- // }
@Test
public void testConnectFailBadHost() throws Exception {
addHandler(new GetOrHeadHandler());
@@ -534,9 +456,7 @@ public class TestInvokeHTTP {
runner.assertTransferCount(Config.REL_NO_RETRY, 0);
runner.assertTransferCount(Config.REL_FAILURE, 1);
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(Config.REL_FAILURE).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(Config.REL_FAILURE).get(0);
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
final String expected = "Hello";
@@ -545,16 +465,12 @@ public class TestInvokeHTTP {
}
private static Map<String, String> createSslProperties() {
- Map<String, String> map = new HashMap<String, String>();
- map.
- put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- map.
- put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ Map<String, String> map = new HashMap<>();
+ map.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
+ map.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
map.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
- map.
- put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- map.
- put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ map.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
+ map.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
map.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
return map;
}
@@ -582,8 +498,7 @@ public class TestInvokeHTTP {
assertEquals("/post", target);
- String body = request.getReader().
- readLine();
+ String body = request.getReader().readLine();
assertEquals("Hello", body);
}
@@ -595,8 +510,7 @@ public class TestInvokeHTTP {
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
baseRequest.setHandled(true);
- int status = Integer.valueOf(target.
- substring("/status".length() + 1));
+ int status = Integer.valueOf(target.substring("/status".length() + 1));
response.setStatus(status);
response.setContentType("text/plain");
@@ -625,8 +539,7 @@ public class TestInvokeHTTP {
response.setStatus(200);
response.setContentType("text/plain");
- response.getWriter().
- println("Way to go!");
+ response.getWriter().println("Way to go!");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestJmsConsumer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestJmsConsumer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestJmsConsumer.java
index 8511b50..274333e 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestJmsConsumer.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestJmsConsumer.java
@@ -56,8 +56,7 @@ public class TestJmsConsumer {
}
/**
- * Test method for
- * {@link org.apache.nifi.processors.standard.JmsConsumer#createMapMessageAttrs(javax.jms.MapMessage)}.
+ * Test method for {@link org.apache.nifi.processors.standard.JmsConsumer#createMapMessageAttrs(javax.jms.MapMessage)}.
*
* @throws JMSException jms
*/
@@ -66,17 +65,12 @@ public class TestJmsConsumer {
MapMessage mapMessage = createMapMessage();
- Map<String, String> mapMessageValues = JmsConsumer.
- createMapMessageValues(mapMessage);
+ Map<String, String> mapMessageValues = JmsConsumer.createMapMessageValues(mapMessage);
assertEquals("", 4, mapMessageValues.size());
- assertEquals("", "Arnold", mapMessageValues.
- get(JmsConsumer.MAP_MESSAGE_PREFIX + "name"));
- assertEquals("", "97", mapMessageValues.
- get(JmsConsumer.MAP_MESSAGE_PREFIX + "age"));
- assertEquals("", "89686.564", mapMessageValues.
- get(JmsConsumer.MAP_MESSAGE_PREFIX + "xyz"));
- assertEquals("", "true", mapMessageValues.
- get(JmsConsumer.MAP_MESSAGE_PREFIX + "good"));
+ assertEquals("", "Arnold", mapMessageValues.get(JmsConsumer.MAP_MESSAGE_PREFIX + "name"));
+ assertEquals("", "97", mapMessageValues.get(JmsConsumer.MAP_MESSAGE_PREFIX + "age"));
+ assertEquals("", "89686.564", mapMessageValues.get(JmsConsumer.MAP_MESSAGE_PREFIX + "xyz"));
+ assertEquals("", "true", mapMessageValues.get(JmsConsumer.MAP_MESSAGE_PREFIX + "good"));
}
/**
@@ -91,28 +85,18 @@ public class TestJmsConsumer {
MapMessage mapMessage = createMapMessage();
ProcessContext context = runner.getProcessContext();
- ProcessSession session = runner.getProcessSessionFactory().
- createSession();
- ProcessorInitializationContext pic = new MockProcessorInitializationContext(runner.
- getProcessor(),
- (MockProcessContext) runner.getProcessContext());
-
- JmsProcessingSummary summary = JmsConsumer.
- map2FlowFile(context, session, mapMessage, true, pic.getLogger());
-
- assertEquals("MapMessage should not create FlowFile content", 0, summary.
- getBytesReceived());
-
- Map<String, String> attributes = summary.getLastFlowFile().
- getAttributes();
- assertEquals("", "Arnold", attributes.
- get(JmsConsumer.MAP_MESSAGE_PREFIX + "name"));
- assertEquals("", "97", attributes.
- get(JmsConsumer.MAP_MESSAGE_PREFIX + "age"));
- assertEquals("", "89686.564", attributes.
- get(JmsConsumer.MAP_MESSAGE_PREFIX + "xyz"));
- assertEquals("", "true", attributes.
- get(JmsConsumer.MAP_MESSAGE_PREFIX + "good"));
+ ProcessSession session = runner.getProcessSessionFactory().createSession();
+ ProcessorInitializationContext pic = new MockProcessorInitializationContext(runner.getProcessor(), (MockProcessContext) runner.getProcessContext());
+
+ JmsProcessingSummary summary = JmsConsumer.map2FlowFile(context, session, mapMessage, true, pic.getLogger());
+
+ assertEquals("MapMessage should not create FlowFile content", 0, summary.getBytesReceived());
+
+ Map<String, String> attributes = summary.getLastFlowFile().getAttributes();
+ assertEquals("", "Arnold", attributes.get(JmsConsumer.MAP_MESSAGE_PREFIX + "name"));
+ assertEquals("", "97", attributes.get(JmsConsumer.MAP_MESSAGE_PREFIX + "age"));
+ assertEquals("", "89686.564", attributes.get(JmsConsumer.MAP_MESSAGE_PREFIX + "xyz"));
+ assertEquals("", "true", attributes.get(JmsConsumer.MAP_MESSAGE_PREFIX + "good"));
}
@Test
@@ -125,19 +109,12 @@ public class TestJmsConsumer {
textMessage.setText(payload);
ProcessContext context = runner.getProcessContext();
- ProcessSession session = runner.getProcessSessionFactory().
- createSession();
- ProcessorInitializationContext pic = new MockProcessorInitializationContext(runner.
- getProcessor(),
- (MockProcessContext) runner.getProcessContext());
+ ProcessSession session = runner.getProcessSessionFactory().createSession();
+ ProcessorInitializationContext pic = new MockProcessorInitializationContext(runner.getProcessor(), (MockProcessContext) runner.getProcessContext());
- JmsProcessingSummary summary = JmsConsumer.
- map2FlowFile(context, session, textMessage, true, pic.
- getLogger());
+ JmsProcessingSummary summary = JmsConsumer.map2FlowFile(context, session, textMessage, true, pic.getLogger());
- assertEquals("TextMessage content length should equal to FlowFile content size", payload.
- length(), summary.getLastFlowFile().
- getSize());
+ assertEquals("TextMessage content length should equal to FlowFile content size", payload.length(), summary.getLastFlowFile().getSize());
final byte[] buffer = new byte[payload.length()];
runner.clearTransferState();
@@ -155,6 +132,8 @@ public class TestJmsConsumer {
/**
* Test BytesMessage to FlowFile conversion
+ *
+ * @throws java.lang.Exception ex
*/
@Test
public void testMap2FlowFileBytesMessage() throws Exception {
@@ -168,19 +147,12 @@ public class TestJmsConsumer {
bytesMessage.reset();
ProcessContext context = runner.getProcessContext();
- ProcessSession session = runner.getProcessSessionFactory().
- createSession();
- ProcessorInitializationContext pic = new MockProcessorInitializationContext(runner.
- getProcessor(),
- (MockProcessContext) runner.getProcessContext());
-
- JmsProcessingSummary summary = JmsConsumer.
- map2FlowFile(context, session, bytesMessage, true, pic.
- getLogger());
-
- assertEquals("BytesMessage content length should equal to FlowFile content size", payload.length, summary.
- getLastFlowFile().
- getSize());
+ ProcessSession session = runner.getProcessSessionFactory().createSession();
+ ProcessorInitializationContext pic = new MockProcessorInitializationContext(runner.getProcessor(), (MockProcessContext) runner.getProcessContext());
+
+ JmsProcessingSummary summary = JmsConsumer.map2FlowFile(context, session, bytesMessage, true, pic.getLogger());
+
+ assertEquals("BytesMessage content length should equal to FlowFile content size", payload.length, summary.getLastFlowFile().getSize());
final byte[] buffer = new byte[payload.length];
runner.clearTransferState();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java
index d4d5524..864d7a7 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenUDP.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.ListenUDP;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -51,10 +50,8 @@ public class TestListenUDP {
System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
System.setProperty("org.slf4j.simpleLogger.showDateTime", "true");
System.setProperty("org.slf4j.simpleLogger.log.nifi.io.nio", "debug");
- System.
- setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.ListenUDP", "debug");
- System.
- setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.TestListenUDP", "debug");
+ System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.ListenUDP", "debug");
+ System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.TestListenUDP", "debug");
LOGGER = LoggerFactory.getLogger(TestListenUDP.class);
}
@@ -88,8 +85,7 @@ public class TestListenUDP {
ProcessContext context = runner.getProcessContext();
ListenUDP processor = (ListenUDP) runner.getProcessor();
- ProcessSessionFactory processSessionFactory = runner.
- getProcessSessionFactory();
+ ProcessSessionFactory processSessionFactory = runner.getProcessSessionFactory();
processor.initializeChannelListenerAndConsumerProcessing(context);
udpSender.start();
boolean transferred = false;
@@ -97,18 +93,14 @@ public class TestListenUDP {
while (!transferred && System.currentTimeMillis() < timeOut) {
Thread.sleep(200);
processor.onTrigger(context, processSessionFactory);
- transferred = runner.
- getFlowFilesForRelationship(ListenUDP.RELATIONSHIP_SUCCESS).
- size() > 0;
+ transferred = runner.getFlowFilesForRelationship(ListenUDP.RELATIONSHIP_SUCCESS).size() > 0;
}
assertTrue("Didn't process the datagrams", transferred);
Thread.sleep(7000);
processor.stopping();
processor.stopped();
socket.close();
- assertTrue(runner.
- getFlowFilesForRelationship(ListenUDP.RELATIONSHIP_SUCCESS).
- size() >= 60);
+ assertTrue(runner.getFlowFilesForRelationship(ListenUDP.RELATIONSHIP_SUCCESS).size() >= 60);
}
@Test
@@ -129,8 +121,7 @@ public class TestListenUDP {
ProcessContext context = runner.getProcessContext();
ListenUDP processor = (ListenUDP) runner.getProcessor();
- ProcessSessionFactory processSessionFactory = runner.
- getProcessSessionFactory();
+ ProcessSessionFactory processSessionFactory = runner.getProcessSessionFactory();
processor.initializeChannelListenerAndConsumerProcessing(context);
udpSender.start();
boolean transferred = false;
@@ -138,18 +129,14 @@ public class TestListenUDP {
while (!transferred && System.currentTimeMillis() < timeOut) {
Thread.sleep(1000);
processor.onTrigger(context, processSessionFactory);
- transferred = runner.
- getFlowFilesForRelationship(ListenUDP.RELATIONSHIP_SUCCESS).
- size() > 0;
+ transferred = runner.getFlowFilesForRelationship(ListenUDP.RELATIONSHIP_SUCCESS).size() > 0;
}
assertTrue("Didn't process the datagrams", transferred);
Thread.sleep(7000);
processor.stopping();
processor.stopped();
socket.close();
- assertTrue(runner.
- getFlowFilesForRelationship(ListenUDP.RELATIONSHIP_SUCCESS).
- size() >= 2);
+ assertTrue(runner.getFlowFilesForRelationship(ListenUDP.RELATIONSHIP_SUCCESS).size() >= 2);
}
@Test
@@ -166,8 +153,7 @@ public class TestListenUDP {
ProcessContext context = runner.getProcessContext();
ListenUDP processor = (ListenUDP) runner.getProcessor();
- ProcessSessionFactory processSessionFactory = runner.
- getProcessSessionFactory();
+ ProcessSessionFactory processSessionFactory = runner.getProcessSessionFactory();
processor.initializeChannelListenerAndConsumerProcessing(context);
udpSender.start();
int numTransfered = 0;
@@ -175,9 +161,7 @@ public class TestListenUDP {
while (numTransfered <= 80 && System.currentTimeMillis() < timeout) {
Thread.sleep(200);
processor.onTrigger(context, processSessionFactory);
- numTransfered = runner.
- getFlowFilesForRelationship(ListenUDP.RELATIONSHIP_SUCCESS).
- size();
+ numTransfered = runner.getFlowFilesForRelationship(ListenUDP.RELATIONSHIP_SUCCESS).size();
}
assertFalse("Did not process all the datagrams", numTransfered < 80);
processor.stopping();
@@ -215,8 +199,7 @@ public class TestListenUDP {
}
final long endTime = System.nanoTime();
final long durationMillis = (endTime - startTime) / 1000000;
- LOGGER.
- info("Sent all UDP packets without any obvious errors | duration ms= " + durationMillis);
+ LOGGER.info("Sent all UDP packets without any obvious errors | duration ms= " + durationMillis);
} catch (IOException e) {
LOGGER.error("", e);
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
index 48ed8c6..a657453 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java
@@ -47,16 +47,14 @@ public class TestMergeContent {
@BeforeClass
public static void setup() {
- System.
- setProperty("org.slf4j.simpleLogger.log.org.apache.nifi.processors.standard", "DEBUG");
+ System.setProperty("org.slf4j.simpleLogger.log.org.apache.nifi.processors.standard", "DEBUG");
}
@Test
public void testSimpleBinaryConcat() throws IOException, InterruptedException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
runner.setProperty(MergeContent.MAX_BIN_AGE, "1 sec");
- runner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
+ runner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
createFlowFiles(runner);
runner.run();
@@ -66,20 +64,16 @@ public class TestMergeContent {
runner.assertTransferCount(MergeContent.REL_FAILURE, 0);
runner.assertTransferCount(MergeContent.REL_ORIGINAL, 3);
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
bundle.assertContentEquals("Hello, World!".getBytes("UTF-8"));
- bundle.
- assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), "application/plain-text");
+ bundle.assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), "application/plain-text");
}
@Test
public void testMimeTypeIsOctetStreamIfConflictingWithBinaryConcat() throws IOException, InterruptedException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
runner.setProperty(MergeContent.MAX_BIN_AGE, "1 sec");
- runner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
+ runner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
createFlowFiles(runner);
@@ -93,12 +87,9 @@ public class TestMergeContent {
runner.assertTransferCount(MergeContent.REL_FAILURE, 0);
runner.assertTransferCount(MergeContent.REL_ORIGINAL, 4);
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
bundle.assertContentEquals("Hello, World!".getBytes("UTF-8"));
- bundle.
- assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), "application/octet-stream");
+ bundle.assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), "application/octet-stream");
}
@Test
@@ -108,10 +99,8 @@ public class TestMergeContent {
runner.setProperty(MergeContent.MAX_BIN_COUNT, "50");
runner.setProperty(MergeContent.MIN_ENTRIES, "10");
runner.setProperty(MergeContent.MAX_ENTRIES, "10");
- runner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
- runner.
- setProperty(MergeContent.CORRELATION_ATTRIBUTE_NAME, "correlationId");
+ runner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
+ runner.setProperty(MergeContent.CORRELATION_ATTRIBUTE_NAME, "correlationId");
final Map<String, String> attrs = new HashMap<>();
for (int i = 0; i < 49; i++) {
@@ -143,8 +132,7 @@ public class TestMergeContent {
@Test
public void testSimpleBinaryConcatWaitsForMin() throws IOException, InterruptedException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
- runner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
+ runner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
runner.setProperty(MergeContent.MIN_SIZE, "20 KB");
createFlowFiles(runner);
@@ -159,8 +147,7 @@ public class TestMergeContent {
public void testZip() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
runner.setProperty(MergeContent.MAX_BIN_AGE, "1 sec");
- runner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_ZIP);
+ runner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_ZIP);
createFlowFiles(runner);
runner.run();
@@ -170,12 +157,8 @@ public class TestMergeContent {
runner.assertTransferCount(MergeContent.REL_FAILURE, 0);
runner.assertTransferCount(MergeContent.REL_ORIGINAL, 3);
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
- try (final InputStream rawIn = new ByteArrayInputStream(runner.
- getContentAsByteArray(bundle));
- final ZipInputStream in = new ZipInputStream(rawIn)) {
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
+ try (final InputStream rawIn = new ByteArrayInputStream(runner.getContentAsByteArray(bundle)); final ZipInputStream in = new ZipInputStream(rawIn)) {
Assert.assertNotNull(in.getNextEntry());
final byte[] part1 = IOUtils.toByteArray(in);
Assert.assertTrue(Arrays.equals("Hello".getBytes("UTF-8"), part1));
@@ -188,16 +171,14 @@ public class TestMergeContent {
final byte[] part3 = IOUtils.toByteArray(in);
Assert.assertTrue(Arrays.equals("World!".getBytes("UTF-8"), part3));
}
- bundle.
- assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), "application/zip");
+ bundle.assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), "application/zip");
}
@Test
public void testTar() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
runner.setProperty(MergeContent.MAX_BIN_AGE, "1 sec");
- runner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_TAR);
+ runner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_TAR);
final Map<String, String> attributes = new HashMap<>();
attributes.put(CoreAttributes.MIME_TYPE.key(), "application/plain-text");
@@ -206,9 +187,7 @@ public class TestMergeContent {
runner.enqueue("Hello".getBytes("UTF-8"), attributes);
attributes.put(CoreAttributes.FILENAME.key(), "ALongerrrFileName");
runner.enqueue(", ".getBytes("UTF-8"), attributes);
- attributes
- .put(CoreAttributes.FILENAME.key(),
- "AReallyLongggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggFileName");
+ attributes.put(CoreAttributes.FILENAME.key(), "AReallyLongggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggFileName");
runner.enqueue("World!".getBytes("UTF-8"), attributes);
runner.run();
@@ -217,12 +196,8 @@ public class TestMergeContent {
runner.assertTransferCount(MergeContent.REL_FAILURE, 0);
runner.assertTransferCount(MergeContent.REL_ORIGINAL, 3);
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
- try (final InputStream rawIn = new ByteArrayInputStream(runner.
- getContentAsByteArray(bundle));
- final TarArchiveInputStream in = new TarArchiveInputStream(rawIn)) {
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
+ try (final InputStream rawIn = new ByteArrayInputStream(runner.getContentAsByteArray(bundle)); final TarArchiveInputStream in = new TarArchiveInputStream(rawIn)) {
ArchiveEntry entry = in.getNextEntry();
Assert.assertNotNull(entry);
assertEquals("AShortFileName", entry.getName());
@@ -235,13 +210,11 @@ public class TestMergeContent {
Assert.assertTrue(Arrays.equals(", ".getBytes("UTF-8"), part2));
entry = in.getNextEntry();
- assertEquals("AReallyLongggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggFileName", entry.
- getName());
+ assertEquals("AReallyLongggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggFileName", entry.getName());
final byte[] part3 = IOUtils.toByteArray(in);
Assert.assertTrue(Arrays.equals("World!".getBytes("UTF-8"), part3));
}
- bundle.
- assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), "application/tar");
+ bundle.assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), "application/tar");
}
@Test
@@ -250,33 +223,26 @@ public class TestMergeContent {
runner.setProperty(MergeContent.MAX_BIN_AGE, "1 sec");
runner.setProperty(MergeContent.MIN_ENTRIES, "2");
runner.setProperty(MergeContent.MAX_ENTRIES, "2");
- runner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_FLOWFILE_STREAM_V3);
+ runner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_FLOWFILE_STREAM_V3);
final Map<String, String> attributes = new HashMap<>();
attributes.put("path", "folder");
- runner.enqueue(Paths.
- get("src/test/resources/TestUnpackContent/folder/cal.txt"), attributes);
- runner.enqueue(Paths.
- get("src/test/resources/TestUnpackContent/folder/date.txt"), attributes);
+ runner.enqueue(Paths.get("src/test/resources/TestUnpackContent/folder/cal.txt"), attributes);
+ runner.enqueue(Paths.get("src/test/resources/TestUnpackContent/folder/date.txt"), attributes);
runner.run();
runner.assertTransferCount(MergeContent.REL_MERGED, 1);
runner.assertTransferCount(MergeContent.REL_FAILURE, 0);
runner.assertTransferCount(MergeContent.REL_ORIGINAL, 2);
- final MockFlowFile merged = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
- merged.
- assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), "application/flowfile-v3");
+ final MockFlowFile merged = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
+ merged.assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), "application/flowfile-v3");
}
@Test
public void testDefragment() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
- runner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
+ runner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
runner.setProperty(MergeContent.MAX_BIN_AGE, "1 min");
final Map<String, String> attributes = new HashMap<>();
@@ -295,18 +261,14 @@ public class TestMergeContent {
runner.run();
runner.assertTransferCount(MergeContent.REL_MERGED, 1);
- final MockFlowFile assembled = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
- assembled.assertContentEquals("A Man A Plan A Canal Panama".
- getBytes("UTF-8"));
+ final MockFlowFile assembled = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
+ assembled.assertContentEquals("A Man A Plan A Canal Panama".getBytes("UTF-8"));
}
@Test
public void testDefragmentWithTooFewFragments() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
- runner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
+ runner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
runner.setProperty(MergeContent.MAX_BIN_AGE, "2 secs");
final Map<String, String> attributes = new HashMap<>();
@@ -339,8 +301,7 @@ public class TestMergeContent {
@Test
public void testDefragmentOutOfOrder() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
- runner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
+ runner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
runner.setProperty(MergeContent.MAX_BIN_AGE, "1 min");
final Map<String, String> attributes = new HashMap<>();
@@ -359,19 +320,15 @@ public class TestMergeContent {
runner.run();
runner.assertTransferCount(MergeContent.REL_MERGED, 1);
- final MockFlowFile assembled = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
- assembled.assertContentEquals("A Man A Plan A Canal Panama".
- getBytes("UTF-8"));
+ final MockFlowFile assembled = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
+ assembled.assertContentEquals("A Man A Plan A Canal Panama".getBytes("UTF-8"));
}
@Ignore("this test appears to be faulty")
@Test
public void testDefragmentMultipleMingledSegments() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
- runner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
+ runner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
runner.setProperty(MergeContent.MAX_BIN_AGE, "1 min");
final Map<String, String> attributes = new HashMap<>();
@@ -400,22 +357,16 @@ public class TestMergeContent {
runner.run(2);
runner.assertTransferCount(MergeContent.REL_MERGED, 2);
- final MockFlowFile assembled = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
- assembled.assertContentEquals("A Man A Plan A Canal Panama".
- getBytes("UTF-8"));
- final MockFlowFile assembledTwo = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(1);
+ final MockFlowFile assembled = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
+ assembled.assertContentEquals("A Man A Plan A Canal Panama".getBytes("UTF-8"));
+ final MockFlowFile assembledTwo = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(1);
assembledTwo.assertContentEquals("No x in Nixon".getBytes("UTF-8"));
}
@Test
public void testDefragmentOldStyleAttributes() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
- runner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
+ runner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
runner.setProperty(MergeContent.MAX_BIN_AGE, "1 min");
final Map<String, String> attributes = new HashMap<>();
@@ -435,20 +386,15 @@ public class TestMergeContent {
runner.run();
runner.assertTransferCount(MergeContent.REL_MERGED, 1);
- final MockFlowFile assembled = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
- assembled.assertContentEquals("A Man A Plan A Canal Panama".
- getBytes("UTF-8"));
- assembled.
- assertAttributeEquals(CoreAttributes.FILENAME.key(), "originalfilename");
+ final MockFlowFile assembled = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
+ assembled.assertContentEquals("A Man A Plan A Canal Panama".getBytes("UTF-8"));
+ assembled.assertAttributeEquals(CoreAttributes.FILENAME.key(), "originalfilename");
}
@Test
public void testDefragmentMultipleOnTriggers() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
- runner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
+ runner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
final Map<String, String> attributes = new HashMap<>();
attributes.put(MergeContent.FRAGMENT_ID_ATTRIBUTE, "1");
@@ -470,19 +416,15 @@ public class TestMergeContent {
runner.run();
runner.assertTransferCount(MergeContent.REL_MERGED, 1);
- final MockFlowFile assembled = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
- assembled.assertContentEquals("A Man A Plan A Canal Panama".
- getBytes("UTF-8"));
+ final MockFlowFile assembled = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
+ assembled.assertContentEquals("A Man A Plan A Canal Panama".getBytes("UTF-8"));
}
@Ignore("This test appears to be a fail...is retuning 1 instead of 2...needs work")
@Test
public void testMergeBasedOnCorrelation() throws IOException, InterruptedException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
- runner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_BIN_PACK);
+ runner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_BIN_PACK);
runner.setProperty(MergeContent.MAX_BIN_AGE, "1 min");
runner.setProperty(MergeContent.CORRELATION_ATTRIBUTE_NAME, "attr");
runner.setProperty(MergeContent.MAX_ENTRIES, "3");
@@ -503,8 +445,7 @@ public class TestMergeContent {
runner.assertTransferCount(MergeContent.REL_MERGED, 2);
- final List<MockFlowFile> mergedFiles = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED);
+ final List<MockFlowFile> mergedFiles = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED);
final MockFlowFile merged1 = mergedFiles.get(0);
final MockFlowFile merged2 = mergedFiles.get(1);
@@ -526,8 +467,7 @@ public class TestMergeContent {
@Test
public void testMaxBinAge() throws InterruptedException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
- runner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_BIN_PACK);
+ runner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_BIN_PACK);
runner.setProperty(MergeContent.MAX_BIN_AGE, "2 sec");
runner.setProperty(MergeContent.CORRELATION_ATTRIBUTE_NAME, "attr");
runner.setProperty(MergeContent.MAX_ENTRIES, "500");
@@ -552,8 +492,7 @@ public class TestMergeContent {
@Test
public void testUniqueAttributes() {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
- runner.
- setProperty(MergeContent.ATTRIBUTE_STRATEGY, MergeContent.ATTRIBUTE_STRATEGY_ALL_UNIQUE);
+ runner.setProperty(MergeContent.ATTRIBUTE_STRATEGY, MergeContent.ATTRIBUTE_STRATEGY_ALL_UNIQUE);
runner.setProperty(MergeContent.MAX_SIZE, "2 B");
runner.setProperty(MergeContent.MIN_SIZE, "2 B");
@@ -572,9 +511,7 @@ public class TestMergeContent {
runner.run();
runner.assertTransferCount(MergeContent.REL_MERGED, 1);
- final MockFlowFile outFile = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
+ final MockFlowFile outFile = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
outFile.assertAttributeEquals("abc", "xyz");
outFile.assertAttributeEquals("hello", "good-bye");
@@ -585,8 +522,7 @@ public class TestMergeContent {
@Test
public void testCommonAttributesOnly() {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
- runner.
- setProperty(MergeContent.ATTRIBUTE_STRATEGY, MergeContent.ATTRIBUTE_STRATEGY_ALL_COMMON);
+ runner.setProperty(MergeContent.ATTRIBUTE_STRATEGY, MergeContent.ATTRIBUTE_STRATEGY_ALL_COMMON);
runner.setProperty(MergeContent.MAX_SIZE, "2 B");
runner.setProperty(MergeContent.MIN_SIZE, "2 B");
@@ -605,9 +541,7 @@ public class TestMergeContent {
runner.run();
runner.assertTransferCount(MergeContent.REL_MERGED, 1);
- final MockFlowFile outFile = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
+ final MockFlowFile outFile = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
outFile.assertAttributeEquals("abc", "xyz");
outFile.assertAttributeNotExists("hello");
@@ -615,8 +549,7 @@ public class TestMergeContent {
outFile.assertAttributeNotExists("xyz");
final Set<String> uuids = new HashSet<>();
- for (final MockFlowFile mff : runner.
- getFlowFilesForRelationship(MergeContent.REL_ORIGINAL)) {
+ for (final MockFlowFile mff : runner.getFlowFilesForRelationship(MergeContent.REL_ORIGINAL)) {
uuids.add(mff.getAttribute(CoreAttributes.UUID.key()));
}
uuids.add(outFile.getAttribute(CoreAttributes.UUID.key()));
@@ -628,8 +561,7 @@ public class TestMergeContent {
public void testCountAttribute() throws IOException, InterruptedException {
final TestRunner runner = TestRunners.newTestRunner(new MergeContent());
runner.setProperty(MergeContent.MAX_BIN_AGE, "1 sec");
- runner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
+ runner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
createFlowFiles(runner);
runner.run();
@@ -639,9 +571,7 @@ public class TestMergeContent {
runner.assertTransferCount(MergeContent.REL_FAILURE, 0);
runner.assertTransferCount(MergeContent.REL_ORIGINAL, 3);
- final MockFlowFile bundle = runner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED).
- get(0);
+ final MockFlowFile bundle = runner.getFlowFilesForRelationship(MergeContent.REL_MERGED).get(0);
bundle.assertContentEquals("Hello, World!".getBytes("UTF-8"));
bundle.assertAttributeEquals(MergeContent.MERGE_COUNT_ATTRIBUTE, "3");
bundle.assertAttributeExists(MergeContent.MERGE_BIN_AGE_ATTRIBUTE);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestModifyBytes.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestModifyBytes.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestModifyBytes.java
index 2c58b80..768a8d0 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestModifyBytes.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestModifyBytes.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.ModifyBytes;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -41,14 +40,11 @@ public class TestModifyBytes {
runner.setProperty(ModifyBytes.START_OFFSET, "1 MB");
runner.setProperty(ModifyBytes.END_OFFSET, "1 MB");
- runner.enqueue(Paths.
- get("src/test/resources/TestModifyBytes/testFile.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestModifyBytes/testFile.txt"));
runner.run();
runner.assertAllFlowFilesTransferred(ModifyBytes.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).get(0);
out.assertContentEquals("".getBytes("UTF-8"));
}
@@ -58,16 +54,12 @@ public class TestModifyBytes {
runner.setProperty(ModifyBytes.START_OFFSET, "0 MB");
runner.setProperty(ModifyBytes.END_OFFSET, "0 MB");
- runner.enqueue(Paths.
- get("src/test/resources/TestModifyBytes/testFile.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestModifyBytes/testFile.txt"));
runner.run();
runner.assertAllFlowFilesTransferred(ModifyBytes.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestModifyBytes/testFile.txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestModifyBytes/testFile.txt")));
}
@Test
@@ -76,18 +68,14 @@ public class TestModifyBytes {
runner.setProperty(ModifyBytes.START_OFFSET, "12 B"); //REMOVE - '<<<HEADER>>>'
runner.setProperty(ModifyBytes.END_OFFSET, "0 MB");
- runner.enqueue(Paths.
- get("src/test/resources/TestModifyBytes/testFile.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestModifyBytes/testFile.txt"));
runner.run();
runner.assertAllFlowFilesTransferred(ModifyBytes.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).get(0);
final String outContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
System.out.println(outContent);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestModifyBytes/noHeader.txt")));
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestModifyBytes/noHeader.txt")));
}
@Test
@@ -96,14 +84,11 @@ public class TestModifyBytes {
runner.setProperty(ModifyBytes.START_OFFSET, "181 B");
runner.setProperty(ModifyBytes.END_OFFSET, "0 B");
- runner.enqueue(Paths.
- get("src/test/resources/TestModifyBytes/testFile.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestModifyBytes/testFile.txt"));
runner.run();
runner.assertAllFlowFilesTransferred(ModifyBytes.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).get(0);
final String outContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
System.out.println(outContent);
out.assertContentEquals("<<<FOOTER>>>".getBytes("UTF-8"));
@@ -115,14 +100,11 @@ public class TestModifyBytes {
runner.setProperty(ModifyBytes.START_OFFSET, "0 B");
runner.setProperty(ModifyBytes.END_OFFSET, "181 B");
- runner.enqueue(Paths.
- get("src/test/resources/TestModifyBytes/testFile.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestModifyBytes/testFile.txt"));
runner.run();
runner.assertAllFlowFilesTransferred(ModifyBytes.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).get(0);
out.assertContentEquals("<<<HEADER>>>".getBytes("UTF-8"));
}
@@ -132,18 +114,14 @@ public class TestModifyBytes {
runner.setProperty(ModifyBytes.START_OFFSET, "0 B");
runner.setProperty(ModifyBytes.END_OFFSET, "12 B");
- runner.enqueue(Paths.
- get("src/test/resources/TestModifyBytes/testFile.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestModifyBytes/testFile.txt"));
runner.run();
runner.assertAllFlowFilesTransferred(ModifyBytes.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).get(0);
final String outContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
System.out.println(outContent);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestModifyBytes/noFooter.txt")));
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestModifyBytes/noFooter.txt")));
}
@Test
@@ -152,18 +130,14 @@ public class TestModifyBytes {
runner.setProperty(ModifyBytes.START_OFFSET, "12 B");
runner.setProperty(ModifyBytes.END_OFFSET, "12 B");
- runner.enqueue(Paths.
- get("src/test/resources/TestModifyBytes/testFile.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestModifyBytes/testFile.txt"));
runner.run();
runner.assertAllFlowFilesTransferred(ModifyBytes.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).get(0);
final String outContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
System.out.println(outContent);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestModifyBytes/noFooter_noHeader.txt")));
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestModifyBytes/noFooter_noHeader.txt")));
}
@Test
@@ -172,14 +146,11 @@ public class TestModifyBytes {
runner.setProperty(ModifyBytes.START_OFFSET, "97 B");
runner.setProperty(ModifyBytes.END_OFFSET, "97 B");
- runner.enqueue(Paths.
- get("src/test/resources/TestModifyBytes/testFile.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestModifyBytes/testFile.txt"));
runner.run();
runner.assertAllFlowFilesTransferred(ModifyBytes.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).get(0);
out.assertContentEquals("".getBytes("UTF-8"));
}
@@ -189,14 +160,11 @@ public class TestModifyBytes {
runner.setProperty(ModifyBytes.START_OFFSET, "94 B");
runner.setProperty(ModifyBytes.END_OFFSET, "96 B");
- runner.enqueue(Paths.
- get("src/test/resources/TestModifyBytes/testFile.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestModifyBytes/testFile.txt"));
runner.run();
runner.assertAllFlowFilesTransferred(ModifyBytes.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ModifyBytes.REL_SUCCESS).get(0);
final String outContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
System.out.println(outContent);
out.assertContentEquals("Dew".getBytes("UTF-8"));
@@ -209,15 +177,13 @@ public class TestModifyBytes {
private byte[] translateNewLines(final Path path) throws IOException {
final byte[] data = Files.readAllBytes(path);
final String text = new String(data, StandardCharsets.UTF_8);
- return translateNewLines(text).
- getBytes(StandardCharsets.UTF_8);
+ return translateNewLines(text).getBytes(StandardCharsets.UTF_8);
}
private String translateNewLines(final String text) {
final String lineSeparator = System.getProperty("line.separator");
final Pattern pattern = Pattern.compile("\n", Pattern.MULTILINE);
- final String translated = pattern.matcher(text).
- replaceAll(lineSeparator);
+ final String translated = pattern.matcher(text).replaceAll(lineSeparator);
return translated;
}
}
[08/12] incubator-nifi git commit: NIFI-271
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
index 0a076ca..21e6b4c 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
@@ -56,54 +56,54 @@ public class FTPTransfer implements FileTransfer {
public static final String PROXY_TYPE_HTTP = Proxy.Type.HTTP.name();
public static final String PROXY_TYPE_SOCKS = Proxy.Type.SOCKS.name();
- public static final PropertyDescriptor CONNECTION_MODE = new PropertyDescriptor.Builder().
- name("Connection Mode").
- description("The FTP Connection Mode").
- allowableValues(CONNECTION_MODE_ACTIVE, CONNECTION_MODE_PASSIVE).
- defaultValue(CONNECTION_MODE_PASSIVE).
- build();
- public static final PropertyDescriptor TRANSFER_MODE = new PropertyDescriptor.Builder().
- name("Transfer Mode").
- description("The FTP Transfer Mode").
- allowableValues(TRANSFER_MODE_BINARY, TRANSFER_MODE_ASCII).
- defaultValue(TRANSFER_MODE_BINARY).
- build();
- public static final PropertyDescriptor PORT = new PropertyDescriptor.Builder().
- name("Port").
- description("The port that the remote system is listening on for file transfers").
- addValidator(StandardValidators.PORT_VALIDATOR).
- required(true).
- defaultValue("21").
- build();
- public static final PropertyDescriptor PROXY_TYPE = new PropertyDescriptor.Builder().
- name("Proxy Type").
- description("Proxy type used for file transfers").
- allowableValues(PROXY_TYPE_DIRECT, PROXY_TYPE_HTTP, PROXY_TYPE_SOCKS).
- defaultValue(PROXY_TYPE_DIRECT).
- build();
- public static final PropertyDescriptor PROXY_HOST = new PropertyDescriptor.Builder().
- name("Proxy Host").
- description("The fully qualified hostname or IP address of the proxy server").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- build();
- public static final PropertyDescriptor PROXY_PORT = new PropertyDescriptor.Builder().
- name("Proxy Port").
- description("The port of the proxy server").
- addValidator(StandardValidators.PORT_VALIDATOR).
- build();
- public static final PropertyDescriptor HTTP_PROXY_USERNAME = new PropertyDescriptor.Builder().
- name("Http Proxy Username").
- description("Http Proxy Username").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- required(false).
- build();
- public static final PropertyDescriptor HTTP_PROXY_PASSWORD = new PropertyDescriptor.Builder().
- name("Http Proxy Password").
- description("Http Proxy Password").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- required(false).
- sensitive(true).
- build();
+ public static final PropertyDescriptor CONNECTION_MODE = new PropertyDescriptor.Builder()
+ .name("Connection Mode")
+ .description("The FTP Connection Mode")
+ .allowableValues(CONNECTION_MODE_ACTIVE, CONNECTION_MODE_PASSIVE)
+ .defaultValue(CONNECTION_MODE_PASSIVE)
+ .build();
+ public static final PropertyDescriptor TRANSFER_MODE = new PropertyDescriptor.Builder()
+ .name("Transfer Mode")
+ .description("The FTP Transfer Mode")
+ .allowableValues(TRANSFER_MODE_BINARY, TRANSFER_MODE_ASCII)
+ .defaultValue(TRANSFER_MODE_BINARY)
+ .build();
+ public static final PropertyDescriptor PORT = new PropertyDescriptor.Builder()
+ .name("Port")
+ .description("The port that the remote system is listening on for file transfers")
+ .addValidator(StandardValidators.PORT_VALIDATOR)
+ .required(true)
+ .defaultValue("21")
+ .build();
+ public static final PropertyDescriptor PROXY_TYPE = new PropertyDescriptor.Builder()
+ .name("Proxy Type")
+ .description("Proxy type used for file transfers")
+ .allowableValues(PROXY_TYPE_DIRECT, PROXY_TYPE_HTTP, PROXY_TYPE_SOCKS)
+ .defaultValue(PROXY_TYPE_DIRECT)
+ .build();
+ public static final PropertyDescriptor PROXY_HOST = new PropertyDescriptor.Builder()
+ .name("Proxy Host")
+ .description("The fully qualified hostname or IP address of the proxy server")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor PROXY_PORT = new PropertyDescriptor.Builder()
+ .name("Proxy Port")
+ .description("The port of the proxy server")
+ .addValidator(StandardValidators.PORT_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor HTTP_PROXY_USERNAME = new PropertyDescriptor.Builder()
+ .name("Http Proxy Username")
+ .description("Http Proxy Username")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .required(false)
+ .build();
+ public static final PropertyDescriptor HTTP_PROXY_PASSWORD = new PropertyDescriptor.Builder()
+ .name("Http Proxy Password")
+ .description("Http Proxy Password")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .required(false)
+ .sensitive(true)
+ .build();
private final ProcessorLog logger;
@@ -135,8 +135,7 @@ public class FTPTransfer implements FileTransfer {
client.disconnect();
}
} catch (final Exception ex) {
- logger.warn("Failed to close FTPClient due to {}", new Object[]{ex.
- toString()}, ex);
+ logger.warn("Failed to close FTPClient due to {}", new Object[]{ex.toString()}, ex);
}
client = null;
}
@@ -149,13 +148,9 @@ public class FTPTransfer implements FileTransfer {
@Override
public List<FileInfo> getListing() throws IOException {
- final String path = ctx.getProperty(FileTransfer.REMOTE_PATH).
- evaluateAttributeExpressions().
- getValue();
+ final String path = ctx.getProperty(FileTransfer.REMOTE_PATH).evaluateAttributeExpressions().getValue();
final int depth = 0;
- final int maxResults = ctx.
- getProperty(FileTransfer.REMOTE_POLL_BATCH_SIZE).
- asInteger();
+ final int maxResults = ctx.getProperty(FileTransfer.REMOTE_POLL_BATCH_SIZE).asInteger();
return getListing(path, depth, maxResults);
}
@@ -166,43 +161,27 @@ public class FTPTransfer implements FileTransfer {
}
if (depth >= 100) {
- logger.
- warn(this + " had to stop recursively searching directories at a recursive depth of " + depth + " to avoid memory issues");
+ logger.warn(this + " had to stop recursively searching directories at a recursive depth of " + depth + " to avoid memory issues");
return listing;
}
- final boolean ignoreDottedFiles = ctx.
- getProperty(FileTransfer.IGNORE_DOTTED_FILES).
- asBoolean();
- final boolean recurse = ctx.getProperty(FileTransfer.RECURSIVE_SEARCH).
- asBoolean();
- final String fileFilterRegex = ctx.
- getProperty(FileTransfer.FILE_FILTER_REGEX).
- getValue();
- final Pattern pattern = (fileFilterRegex == null) ? null : Pattern.
- compile(fileFilterRegex);
- final String pathFilterRegex = ctx.
- getProperty(FileTransfer.PATH_FILTER_REGEX).
- getValue();
- final Pattern pathPattern = (!recurse || pathFilterRegex == null) ? null : Pattern.
- compile(pathFilterRegex);
- final String remotePath = ctx.getProperty(FileTransfer.REMOTE_PATH).
- evaluateAttributeExpressions().
- getValue();
+ final boolean ignoreDottedFiles = ctx.getProperty(FileTransfer.IGNORE_DOTTED_FILES).asBoolean();
+ final boolean recurse = ctx.getProperty(FileTransfer.RECURSIVE_SEARCH).asBoolean();
+ final String fileFilterRegex = ctx.getProperty(FileTransfer.FILE_FILTER_REGEX).getValue();
+ final Pattern pattern = (fileFilterRegex == null) ? null : Pattern.compile(fileFilterRegex);
+ final String pathFilterRegex = ctx.getProperty(FileTransfer.PATH_FILTER_REGEX).getValue();
+ final Pattern pathPattern = (!recurse || pathFilterRegex == null) ? null : Pattern.compile(pathFilterRegex);
+ final String remotePath = ctx.getProperty(FileTransfer.REMOTE_PATH).evaluateAttributeExpressions().getValue();
// check if this directory path matches the PATH_FILTER_REGEX
boolean pathFilterMatches = true;
if (pathPattern != null) {
Path reldir = path == null ? Paths.get(".") : Paths.get(path);
if (remotePath != null) {
- reldir = Paths.get(remotePath).
- relativize(reldir);
+ reldir = Paths.get(remotePath).relativize(reldir);
}
- if (reldir != null && !reldir.toString().
- isEmpty()) {
- if (!pathPattern.matcher(reldir.toString().
- replace("\\", "/")).
- matches()) {
+ if (reldir != null && !reldir.toString().isEmpty()) {
+ if (!pathPattern.matcher(reldir.toString().replace("\\", "/")).matches()) {
pathFilterMatches = false;
}
}
@@ -213,14 +192,12 @@ public class FTPTransfer implements FileTransfer {
int count = 0;
final FTPFile[] files;
- if (path == null || path.trim().
- isEmpty()) {
+ if (path == null || path.trim().isEmpty()) {
files = client.listFiles(".");
} else {
files = client.listFiles(path);
}
- if (files.length == 0 && path != null && !path.trim().
- isEmpty()) {
+ if (files.length == 0 && path != null && !path.trim().isEmpty()) {
// throw exception if directory doesn't exist
final boolean cdSuccessful = setWorkingDirectory(path);
if (!cdSuccessful) {
@@ -239,24 +216,20 @@ public class FTPTransfer implements FileTransfer {
}
final File newFullPath = new File(path, filename);
- final String newFullForwardPath = newFullPath.getPath().
- replace("\\", "/");
+ final String newFullForwardPath = newFullPath.getPath().replace("\\", "/");
if (recurse && file.isDirectory()) {
try {
- listing.
- addAll(getListing(newFullForwardPath, depth + 1, maxResults - count));
+ listing.addAll(getListing(newFullForwardPath, depth + 1, maxResults - count));
} catch (final IOException e) {
- logger.
- error("Unable to get listing from " + newFullForwardPath + "; skipping this subdirectory");
+ logger.error("Unable to get listing from " + newFullForwardPath + "; skipping this subdirectory");
}
}
// if is not a directory and is not a link and it matches
// FILE_FILTER_REGEX - then let's add it
if (!file.isDirectory() && !file.isSymbolicLink() && pathFilterMatches) {
- if (pattern == null || pattern.matcher(filename).
- matches()) {
+ if (pattern == null || pattern.matcher(filename).matches()) {
listing.add(newFileInfo(file, path));
count++;
}
@@ -275,38 +248,27 @@ public class FTPTransfer implements FileTransfer {
return null;
}
final File newFullPath = new File(path, file.getName());
- final String newFullForwardPath = newFullPath.getPath().
- replace("\\", "/");
+ final String newFullForwardPath = newFullPath.getPath().replace("\\", "/");
StringBuilder perms = new StringBuilder();
- perms.append(file.
- hasPermission(FTPFile.USER_ACCESS, FTPFile.READ_PERMISSION) ? "r" : "-");
- perms.append(file.
- hasPermission(FTPFile.USER_ACCESS, FTPFile.WRITE_PERMISSION) ? "w" : "-");
- perms.append(file.
- hasPermission(FTPFile.USER_ACCESS, FTPFile.EXECUTE_PERMISSION) ? "x" : "-");
- perms.append(file.
- hasPermission(FTPFile.GROUP_ACCESS, FTPFile.READ_PERMISSION) ? "r" : "-");
- perms.append(file.
- hasPermission(FTPFile.GROUP_ACCESS, FTPFile.WRITE_PERMISSION) ? "w" : "-");
- perms.append(file.
- hasPermission(FTPFile.GROUP_ACCESS, FTPFile.EXECUTE_PERMISSION) ? "x" : "-");
- perms.append(file.
- hasPermission(FTPFile.WORLD_ACCESS, FTPFile.READ_PERMISSION) ? "r" : "-");
- perms.append(file.
- hasPermission(FTPFile.WORLD_ACCESS, FTPFile.WRITE_PERMISSION) ? "w" : "-");
- perms.append(file.
- hasPermission(FTPFile.WORLD_ACCESS, FTPFile.EXECUTE_PERMISSION) ? "x" : "-");
+ perms.append(file.hasPermission(FTPFile.USER_ACCESS, FTPFile.READ_PERMISSION) ? "r" : "-");
+ perms.append(file.hasPermission(FTPFile.USER_ACCESS, FTPFile.WRITE_PERMISSION) ? "w" : "-");
+ perms.append(file.hasPermission(FTPFile.USER_ACCESS, FTPFile.EXECUTE_PERMISSION) ? "x" : "-");
+ perms.append(file.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.READ_PERMISSION) ? "r" : "-");
+ perms.append(file.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.WRITE_PERMISSION) ? "w" : "-");
+ perms.append(file.hasPermission(FTPFile.GROUP_ACCESS, FTPFile.EXECUTE_PERMISSION) ? "x" : "-");
+ perms.append(file.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.READ_PERMISSION) ? "r" : "-");
+ perms.append(file.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.WRITE_PERMISSION) ? "w" : "-");
+ perms.append(file.hasPermission(FTPFile.WORLD_ACCESS, FTPFile.EXECUTE_PERMISSION) ? "x" : "-");
FileInfo.Builder builder = new FileInfo.Builder()
- .filename(file.getName()).
- fullPathFileName(newFullForwardPath).
- directory(file.isDirectory()).
- size(file.getSize()).
- lastModifiedTime(file.getTimestamp().
- getTimeInMillis()).
- permissions(perms.toString()).
- owner(file.getUser()).
- group(file.getGroup());
+ .filename(file.getName())
+ .fullPathFileName(newFullForwardPath)
+ .directory(file.isDirectory())
+ .size(file.getSize())
+ .lastModifiedTime(file.getTimestamp().getTimeInMillis())
+ .permissions(perms.toString())
+ .owner(file.getUser())
+ .group(file.getGroup());
return builder.build();
}
@@ -359,20 +321,16 @@ public class FTPTransfer implements FileTransfer {
@Override
public void ensureDirectoryExists(final FlowFile flowFile, final File directoryName) throws IOException {
- if (directoryName.getParent() != null && !directoryName.getParentFile().
- equals(new File(File.separator))) {
+ if (directoryName.getParent() != null && !directoryName.getParentFile().equals(new File(File.separator))) {
ensureDirectoryExists(flowFile, directoryName.getParentFile());
}
- final String remoteDirectory = directoryName.getAbsolutePath().
- replace("\\", "/").
- replaceAll("^.\\:", "");
+ final String remoteDirectory = directoryName.getAbsolutePath().replace("\\", "/").replaceAll("^.\\:", "");
final FTPClient client = getClient(flowFile);
final boolean cdSuccessful = setWorkingDirectory(remoteDirectory);
if (!cdSuccessful) {
- logger.
- debug("Remote Directory {} does not exist; creating it", new Object[]{remoteDirectory});
+ logger.debug("Remote Directory {} does not exist; creating it", new Object[]{remoteDirectory});
if (client.makeDirectory(remoteDirectory)) {
logger.debug("Created {}", new Object[]{remoteDirectory});
} else {
@@ -410,26 +368,19 @@ public class FTPTransfer implements FileTransfer {
fullPath = workingDir.endsWith("/") ? workingDir + filename : workingDir + "/" + filename;
}
- String tempFilename = ctx.getProperty(TEMP_FILENAME).
- evaluateAttributeExpressions(flowFile).
- getValue();
+ String tempFilename = ctx.getProperty(TEMP_FILENAME).evaluateAttributeExpressions(flowFile).getValue();
if (tempFilename == null) {
- final boolean dotRename = ctx.getProperty(DOT_RENAME).
- asBoolean();
+ final boolean dotRename = ctx.getProperty(DOT_RENAME).asBoolean();
tempFilename = dotRename ? "." + filename : filename;
}
final boolean storeSuccessful = client.storeFile(tempFilename, content);
if (!storeSuccessful) {
- throw new IOException("Failed to store file " + tempFilename + " to " + fullPath + " due to: " + client.
- getReplyString());
+ throw new IOException("Failed to store file " + tempFilename + " to " + fullPath + " due to: " + client.getReplyString());
}
- final String lastModifiedTime = ctx.getProperty(LAST_MODIFIED_TIME).
- evaluateAttributeExpressions(flowFile).
- getValue();
- if (lastModifiedTime != null && !lastModifiedTime.trim().
- isEmpty()) {
+ final String lastModifiedTime = ctx.getProperty(LAST_MODIFIED_TIME).evaluateAttributeExpressions(flowFile).getValue();
+ if (lastModifiedTime != null && !lastModifiedTime.trim().isEmpty()) {
try {
final DateFormat informat = new SimpleDateFormat(FILE_MODIFY_DATE_ATTR_FORMAT, Locale.US);
final Date fileModifyTime = informat.parse(lastModifiedTime);
@@ -437,43 +388,32 @@ public class FTPTransfer implements FileTransfer {
final String time = outformat.format(fileModifyTime);
if (!client.setModificationTime(tempFilename, time)) {
// FTP server probably doesn't support MFMT command
- logger.
- warn("Could not set lastModifiedTime on {} to {}", new Object[]{flowFile, lastModifiedTime});
+ logger.warn("Could not set lastModifiedTime on {} to {}", new Object[]{flowFile, lastModifiedTime});
}
} catch (final Exception e) {
- logger.
- error("Failed to set lastModifiedTime on {} to {} due to {}", new Object[]{flowFile, lastModifiedTime, e});
+ logger.error("Failed to set lastModifiedTime on {} to {} due to {}", new Object[]{flowFile, lastModifiedTime, e});
}
}
- final String permissions = ctx.getProperty(PERMISSIONS).
- evaluateAttributeExpressions(flowFile).
- getValue();
- if (permissions != null && !permissions.trim().
- isEmpty()) {
+ final String permissions = ctx.getProperty(PERMISSIONS).evaluateAttributeExpressions(flowFile).getValue();
+ if (permissions != null && !permissions.trim().isEmpty()) {
try {
int perms = numberPermissions(permissions);
if (perms >= 0) {
- if (!client.sendSiteCommand("chmod " + Integer.
- toOctalString(perms) + " " + tempFilename)) {
- logger.
- warn("Could not set permission on {} to {}", new Object[]{flowFile, permissions});
+ if (!client.sendSiteCommand("chmod " + Integer.toOctalString(perms) + " " + tempFilename)) {
+ logger.warn("Could not set permission on {} to {}", new Object[]{flowFile, permissions});
}
}
} catch (final Exception e) {
- logger.
- error("Failed to set permission on {} to {} due to {}", new Object[]{flowFile, permissions, e});
+ logger.error("Failed to set permission on {} to {} due to {}", new Object[]{flowFile, permissions, e});
}
}
if (!filename.equals(tempFilename)) {
try {
- logger.
- debug("Renaming remote path from {} to {} for {}", new Object[]{tempFilename, filename, flowFile});
- final boolean renameSuccessful = client.
- rename(tempFilename, filename);
+ logger.debug("Renaming remote path from {} to {} for {}", new Object[]{tempFilename, filename, flowFile});
+ final boolean renameSuccessful = client.rename(tempFilename, filename);
if (!renameSuccessful) {
- throw new IOException("Failed to rename temporary file " + tempFilename + " to " + fullPath + " due to: " + client.
- getReplyString());
+ throw new IOException("Failed to rename temporary file " + tempFilename + " to " + fullPath + " due to: " + client.getReplyString());
}
} catch (final IOException e) {
try {
@@ -495,8 +435,7 @@ public class FTPTransfer implements FileTransfer {
setWorkingDirectory(path);
}
if (!client.deleteFile(remoteFileName)) {
- throw new IOException("Failed to remove file " + remoteFileName + " due to " + client.
- getReplyString());
+ throw new IOException("Failed to remove file " + remoteFileName + " due to " + client.getReplyString());
}
}
@@ -505,8 +444,7 @@ public class FTPTransfer implements FileTransfer {
final FTPClient client = getClient(null);
final boolean success = client.removeDirectory(remoteDirectoryName);
if (!success) {
- throw new IOException("Failed to remove directory " + remoteDirectoryName + " due to " + client.
- getReplyString());
+ throw new IOException("Failed to remove directory " + remoteDirectoryName + " due to " + client.getReplyString());
}
}
@@ -525,14 +463,10 @@ public class FTPTransfer implements FileTransfer {
if (!cmd.isEmpty()) {
int result;
result = client.sendCommand(cmd);
- logger.
- debug(this + " sent command to the FTP server: " + cmd + " for " + flowFile);
-
- if (FTPReply.isNegativePermanent(result) || FTPReply.
- isNegativeTransient(result)) {
- throw new IOException(this + " negative reply back from FTP server cmd: "
- + cmd + " reply:" + result + ": " + client.
- getReplyString() + " for " + flowFile);
+ logger.debug(this + " sent command to the FTP server: " + cmd + " for " + flowFile);
+
+ if (FTPReply.isNegativePermanent(result) || FTPReply.isNegativeTransient(result)) {
+ throw new IOException(this + " negative reply back from FTP server cmd: " + cmd + " reply:" + result + ": " + client.getReplyString() + " for " + flowFile);
}
}
}
@@ -540,9 +474,7 @@ public class FTPTransfer implements FileTransfer {
private FTPClient getClient(final FlowFile flowFile) throws IOException {
if (client != null) {
- String desthost = ctx.getProperty(HOSTNAME).
- evaluateAttributeExpressions(flowFile).
- getValue();
+ String desthost = ctx.getProperty(HOSTNAME).evaluateAttributeExpressions(flowFile).getValue();
if (remoteHostName.equals(desthost)) {
// destination matches so we can keep our current session
resetWorkingDirectory();
@@ -553,38 +485,24 @@ public class FTPTransfer implements FileTransfer {
}
}
- final Proxy.Type proxyType = Proxy.Type.valueOf(ctx.
- getProperty(PROXY_TYPE).
- getValue());
- final String proxyHost = ctx.getProperty(PROXY_HOST).
- getValue();
- final Integer proxyPort = ctx.getProperty(PROXY_PORT).
- asInteger();
+ final Proxy.Type proxyType = Proxy.Type.valueOf(ctx.getProperty(PROXY_TYPE).getValue());
+ final String proxyHost = ctx.getProperty(PROXY_HOST).getValue();
+ final Integer proxyPort = ctx.getProperty(PROXY_PORT).asInteger();
FTPClient client;
if (proxyType == Proxy.Type.HTTP) {
- client = new FTPHTTPClient(proxyHost, proxyPort, ctx.
- getProperty(HTTP_PROXY_USERNAME).
- getValue(), ctx.getProperty(HTTP_PROXY_PASSWORD).
- getValue());
+ client = new FTPHTTPClient(proxyHost, proxyPort, ctx.getProperty(HTTP_PROXY_USERNAME).getValue(), ctx.getProperty(HTTP_PROXY_PASSWORD).getValue());
} else {
client = new FTPClient();
if (proxyType == Proxy.Type.SOCKS) {
- client.
- setSocketFactory(new SocksProxySocketFactory(new Proxy(proxyType, new InetSocketAddress(proxyHost, proxyPort))));
+ client.setSocketFactory(new SocksProxySocketFactory(new Proxy(proxyType, new InetSocketAddress(proxyHost, proxyPort))));
}
}
this.client = client;
- client.setDataTimeout(ctx.getProperty(DATA_TIMEOUT).
- asTimePeriod(TimeUnit.MILLISECONDS).
- intValue());
- client.setDefaultTimeout(ctx.getProperty(CONNECTION_TIMEOUT).
- asTimePeriod(TimeUnit.MILLISECONDS).
- intValue());
+ client.setDataTimeout(ctx.getProperty(DATA_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue());
+ client.setDefaultTimeout(ctx.getProperty(CONNECTION_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue());
client.setRemoteVerificationEnabled(false);
- final String remoteHostname = ctx.getProperty(HOSTNAME).
- evaluateAttributeExpressions(flowFile).
- getValue();
+ final String remoteHostname = ctx.getProperty(HOSTNAME).evaluateAttributeExpressions(flowFile).getValue();
this.remoteHostName = remoteHostname;
InetAddress inetAddress = null;
try {
@@ -596,35 +514,26 @@ public class FTPTransfer implements FileTransfer {
inetAddress = InetAddress.getByName(remoteHostname);
}
- client.connect(inetAddress, ctx.getProperty(PORT).
- asInteger());
+ client.connect(inetAddress, ctx.getProperty(PORT).asInteger());
this.closed = false;
- client.setDataTimeout(ctx.getProperty(DATA_TIMEOUT).
- asTimePeriod(TimeUnit.MILLISECONDS).
- intValue());
- client.setSoTimeout(ctx.getProperty(CONNECTION_TIMEOUT).
- asTimePeriod(TimeUnit.MILLISECONDS).
- intValue());
-
- final String username = ctx.getProperty(USERNAME).
- getValue();
- final String password = ctx.getProperty(PASSWORD).
- getValue();
+ client.setDataTimeout(ctx.getProperty(DATA_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue());
+ client.setSoTimeout(ctx.getProperty(CONNECTION_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue());
+
+ final String username = ctx.getProperty(USERNAME).getValue();
+ final String password = ctx.getProperty(PASSWORD).getValue();
final boolean loggedIn = client.login(username, password);
if (!loggedIn) {
throw new IOException("Could not login for user '" + username + "'");
}
- final String connectionMode = ctx.getProperty(CONNECTION_MODE).
- getValue();
+ final String connectionMode = ctx.getProperty(CONNECTION_MODE).getValue();
if (connectionMode.equalsIgnoreCase(CONNECTION_MODE_ACTIVE)) {
client.enterLocalActiveMode();
} else {
client.enterLocalPassiveMode();
}
- final String transferMode = ctx.getProperty(TRANSFER_MODE).
- getValue();
+ final String transferMode = ctx.getProperty(TRANSFER_MODE).getValue();
final int fileType = (transferMode.equalsIgnoreCase(TRANSFER_MODE_ASCII)) ? FTPClient.ASCII_FILE_TYPE : FTPClient.BINARY_FILE_TYPE;
if (!client.setFileType(fileType)) {
throw new IOException("Unable to set transfer mode to type " + transferMode);
@@ -638,8 +547,7 @@ public class FTPTransfer implements FileTransfer {
int number = -1;
final Pattern rwxPattern = Pattern.compile("^[rwx-]{9}$");
final Pattern numPattern = Pattern.compile("\\d+");
- if (rwxPattern.matcher(perms).
- matches()) {
+ if (rwxPattern.matcher(perms).matches()) {
number = 0;
if (perms.charAt(0) == 'r') {
number |= 0x100;
@@ -668,8 +576,7 @@ public class FTPTransfer implements FileTransfer {
if (perms.charAt(8) == 'x') {
number |= 0x1;
}
- } else if (numPattern.matcher(perms).
- matches()) {
+ } else if (numPattern.matcher(perms).matches()) {
try {
number = Integer.parseInt(perms, 8);
} catch (NumberFormatException ignore) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
index fa7722b..0e6a26f 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
@@ -57,47 +57,30 @@ public class FTPUtils {
public static final String NETWORK_SOCKET_TIMEOUT_KEY = "network.socket.timeout";
/**
- * Creates a new FTPClient connected to an FTP server. The following
- * properties must exist:
+ * Creates a new FTPClient connected to an FTP server. The following properties must exist:
* <ul>Required Properties:
- * <li>remote.host - The hostname or IP address of the FTP server to connect
- * to</li>
+ * <li>remote.host - The hostname or IP address of the FTP server to connect to</li>
* <li>remote.user - The username of the account to authenticate with</li>
- * <li>remote.password = The password for the username to authenticate
- * with</li>
+ * <li>remote.password = The password for the username to authenticate with</li>
* </ul>
* <ul>Optional Properties:
- * <li>remote.port - The port on the FTP server to connect to. Defaults to
- * FTP default.</li>
- * <li>transfer.mode - The type of transfer for this connection ('ascii',
- * 'binary'). Defaults to 'binary'</li>
- * <li>connection.mode - The type of FTP connection to make ('active_local',
- * 'passive_local'). Defaults to 'active_local'. In active_local the server
- * initiates 'data connections' to the client where in passive_local the
- * client initiates 'data connections' to the server.</li>
- * <li>network.data.timeout - Default is 0. Sets the timeout in milliseconds
- * for waiting to establish a new 'data connection' (not a control
- * connection) when in ACTIVE_LOCAL mode. Also, this establishes the amount
- * of time to wait on read calls on the data connection in either mode. A
- * value of zero means do not timeout. Users should probably set a value
- * here unless using very reliable communications links or else risk
- * indefinite hangs that require a restart.</li>
- * <li>network.socket.timeout - Default is 0. Sets the timeout in
- * milliseconds to use when creating a new control channel socket and also a
- * timeout to set when reading from a control socket. A value of zero means
- * do not timeout. Users should probably set a value here unless using very
- * reliable communications links or else risk indefinite hangs that require
- * a restart.</li>
+ * <li>remote.port - The port on the FTP server to connect to. Defaults to FTP default.</li>
+ * <li>transfer.mode - The type of transfer for this connection ('ascii', 'binary'). Defaults to 'binary'</li>
+ * <li>connection.mode - The type of FTP connection to make ('active_local', 'passive_local'). Defaults to 'active_local'. In active_local the server initiates 'data connections' to the client
+ * where in passive_local the client initiates 'data connections' to the server.</li>
+ * <li>network.data.timeout - Default is 0. Sets the timeout in milliseconds for waiting to establish a new 'data connection' (not a control connection) when in ACTIVE_LOCAL mode. Also, this
+ * establishes the amount of time to wait on read calls on the data connection in either mode. A value of zero means do not timeout. Users should probably set a value here unless using very
+ * reliable communications links or else risk indefinite hangs that require a restart.</li>
+ * <li>network.socket.timeout - Default is 0. Sets the timeout in milliseconds to use when creating a new control channel socket and also a timeout to set when reading from a control socket. A
+ * value of zero means do not timeout. Users should probably set a value here unless using very reliable communications links or else risk indefinite hangs that require a restart.</li>
* </ul>
*
* @param conf
- * @param monitor if provided will be used to monitor FTP commands processed
- * but may be null
+ * @param monitor if provided will be used to monitor FTP commands processed but may be null
* @return FTPClient connected to FTP server as configured
* @throws NullPointerException if either argument is null
* @throws IllegalArgumentException if a required property is missing
- * @throws NumberFormatException if any argument that must be an int cannot
- * be converted to int
+ * @throws NumberFormatException if any argument that must be an int cannot be converted to int
* @throws IOException if some problem occurs connecting to FTP server
*/
public static FTPClient connect(final FTPConfiguration conf, final ProtocolCommandListener monitor) throws IOException {
@@ -112,11 +95,9 @@ public class FTPUtils {
final String transferModeVal = conf.transferMode;
final String transferMode = (null == transferModeVal) ? BINARY_TRANSFER_MODE : transferModeVal;
final String networkDataTimeoutVal = conf.dataTimeout;
- final int networkDataTimeout = (null == networkDataTimeoutVal) ? 0 : Integer.
- parseInt(networkDataTimeoutVal);
+ final int networkDataTimeout = (null == networkDataTimeoutVal) ? 0 : Integer.parseInt(networkDataTimeoutVal);
final String networkSocketTimeoutVal = conf.connectionTimeout;
- final int networkSocketTimeout = (null == networkSocketTimeoutVal) ? 0 : Integer.
- parseInt(networkSocketTimeoutVal);
+ final int networkSocketTimeout = (null == networkSocketTimeoutVal) ? 0 : Integer.parseInt(networkSocketTimeoutVal);
final FTPClient client = new FTPClient();
if (networkDataTimeout > 0) {
@@ -182,60 +163,47 @@ public class FTPUtils {
@Override
public void protocolCommandSent(final ProtocolCommandEvent event) {
if (logger.isDebugEnabled()) {
- logger.debug(processor + " : " + event.getMessage().
- trim());
+ logger.debug(processor + " : " + event.getMessage().trim());
}
}
@Override
public void protocolReplyReceived(final ProtocolCommandEvent event) {
if (logger.isDebugEnabled()) {
- logger.debug(processor + " : " + event.getMessage().
- trim());
+ logger.debug(processor + " : " + event.getMessage().trim());
}
}
}
/**
- * Handles the logic required to change to the given directory RELATIVE TO
- * THE CURRENT DIRECTORY which can include creating new directories needed.
+ * Handles the logic required to change to the given directory RELATIVE TO THE CURRENT DIRECTORY which can include creating new directories needed.
*
- * This will first attempt to change to the full path of the given directory
- * outright. If that fails, then it will attempt to change from the top of
- * the tree of the given directory all the way down to the final leaf node
- * of the given directory.
+ * This will first attempt to change to the full path of the given directory outright. If that fails, then it will attempt to change from the top of the tree of the given directory all the way
+ * down to the final leaf node of the given directory.
*
* @param client - the ftp client with an already active connection
* @param dirPath - the path to change or create directories to
- * @param createDirs - if true will attempt to create any missing
- * directories
+ * @param createDirs - if true will attempt to create any missing directories
* @param processor - used solely for targetting logging output.
* @throws IOException if any access problem occurs
*/
public static void changeWorkingDirectory(final FTPClient client, final String dirPath, final boolean createDirs, final Processor processor) throws IOException {
final String currentWorkingDirectory = client.printWorkingDirectory();
final File dir = new File(dirPath);
- logger.
- debug(processor + " attempting to change directory from " + currentWorkingDirectory + " to " + dir.
- getPath());
+ logger.debug(processor + " attempting to change directory from " + currentWorkingDirectory + " to " + dir.getPath());
boolean dirExists = false;
- final String forwardPaths = dir.getPath().
- replaceAll(Matcher.quoteReplacement("\\"), Matcher.
- quoteReplacement("/"));
+ final String forwardPaths = dir.getPath().replaceAll(Matcher.quoteReplacement("\\"), Matcher.quoteReplacement("/"));
//always use forward paths for long string attempt
try {
dirExists = client.changeWorkingDirectory(forwardPaths);
if (dirExists) {
- logger.
- debug(processor + " changed working directory to '" + forwardPaths + "' from '" + currentWorkingDirectory + "'");
+ logger.debug(processor + " changed working directory to '" + forwardPaths + "' from '" + currentWorkingDirectory + "'");
} else {
- logger.
- debug(processor + " could not change directory to '" + forwardPaths + "' from '" + currentWorkingDirectory + "' so trying the hard way.");
+ logger.debug(processor + " could not change directory to '" + forwardPaths + "' from '" + currentWorkingDirectory + "' so trying the hard way.");
}
} catch (final IOException ioe) {
- logger.
- debug(processor + " could not change directory to '" + forwardPaths + "' from '" + currentWorkingDirectory + "' so trying the hard way.");
+ logger.debug(processor + " could not change directory to '" + forwardPaths + "' from '" + currentWorkingDirectory + "' so trying the hard way.");
}
if (!dirExists) { //coulnd't navigate directly...begin hard work
final Deque<String> stack = new LinkedList<>();
@@ -256,15 +224,12 @@ public class FTPUtils {
exists = false;
}
if (!exists && createDirs) {
- logger.
- debug(processor + " creating new directory and changing to it " + dirName);
+ logger.debug(processor + " creating new directory and changing to it " + dirName);
client.makeDirectory(dirName);
- if (!(client.makeDirectory(dirName) || client.
- changeWorkingDirectory(dirName))) {
+ if (!(client.makeDirectory(dirName) || client.changeWorkingDirectory(dirName))) {
throw new IOException(processor + " could not create and change to newly created directory " + dirName);
} else {
- logger.
- debug(processor + " successfully changed working directory to " + dirName);
+ logger.debug(processor + " successfully changed working directory to " + dirName);
}
} else if (!exists) {
throw new IOException(processor + " could not change directory to '" + dirName + "' from '" + currentWorkingDirectory + "'");
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java
index 6605ff6..c57b4e0 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileInfo.java
@@ -67,8 +67,7 @@ public class FileInfo implements Comparable<FileInfo>, Serializable {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((fullPathFileName == null) ? 0 : fullPathFileName.
- hashCode());
+ result = prime * result + ((fullPathFileName == null) ? 0 : fullPathFileName.hashCode());
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java
index 3af00fa..ece0e59 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FileTransfer.java
@@ -50,125 +50,125 @@ public interface FileTransfer extends Closeable {
void ensureDirectoryExists(FlowFile flowFile, File remoteDirectory) throws IOException;
- public static final PropertyDescriptor HOSTNAME = new PropertyDescriptor.Builder().
- name("Hostname").
- description("The fully qualified hostname or IP address of the remote system").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- required(true).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor USERNAME = new PropertyDescriptor.Builder().
- name("Username").
- description("Username").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- required(true).
- build();
- public static final PropertyDescriptor PASSWORD = new PropertyDescriptor.Builder().
- name("Password").
- description("Password for the user account").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- required(false).
- sensitive(true).
- build();
- public static final PropertyDescriptor DATA_TIMEOUT = new PropertyDescriptor.Builder().
- name("Data Timeout").
- description("Amount of time to wait before timing out while transferring data").
- required(true).
- addValidator(StandardValidators.TIME_PERIOD_VALIDATOR).
- defaultValue("30 sec").
- build();
- public static final PropertyDescriptor CONNECTION_TIMEOUT = new PropertyDescriptor.Builder().
- name("Connection Timeout").
- description("Amount of time to wait before timing out while creating a connection").
- required(true).
- addValidator(StandardValidators.TIME_PERIOD_VALIDATOR).
- defaultValue("30 sec").
- build();
- public static final PropertyDescriptor REMOTE_PATH = new PropertyDescriptor.Builder().
- name("Remote Path").
- description("The path on the remote system from which to pull or push files").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor CREATE_DIRECTORY = new PropertyDescriptor.Builder().
- name("Create Directory").
- description("Specifies whether or not the remote directory should be created if it does not exist.").
- required(true).
- allowableValues("true", "false").
- defaultValue("false").
- build();
-
- public static final PropertyDescriptor USE_COMPRESSION = new PropertyDescriptor.Builder().
- name("Use Compression").
- description("Indicates whether or not ZLIB compression should be used when transferring files").
- allowableValues("true", "false").
- defaultValue("false").
- required(true).
- build();
+ public static final PropertyDescriptor HOSTNAME = new PropertyDescriptor.Builder()
+ .name("Hostname")
+ .description("The fully qualified hostname or IP address of the remote system")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .required(true)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor USERNAME = new PropertyDescriptor.Builder()
+ .name("Username")
+ .description("Username")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .required(true)
+ .build();
+ public static final PropertyDescriptor PASSWORD = new PropertyDescriptor.Builder()
+ .name("Password")
+ .description("Password for the user account")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .required(false)
+ .sensitive(true)
+ .build();
+ public static final PropertyDescriptor DATA_TIMEOUT = new PropertyDescriptor.Builder()
+ .name("Data Timeout")
+ .description("Amount of time to wait before timing out while transferring data")
+ .required(true)
+ .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
+ .defaultValue("30 sec")
+ .build();
+ public static final PropertyDescriptor CONNECTION_TIMEOUT = new PropertyDescriptor.Builder()
+ .name("Connection Timeout")
+ .description("Amount of time to wait before timing out while creating a connection")
+ .required(true)
+ .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
+ .defaultValue("30 sec")
+ .build();
+ public static final PropertyDescriptor REMOTE_PATH = new PropertyDescriptor.Builder()
+ .name("Remote Path")
+ .description("The path on the remote system from which to pull or push files")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor CREATE_DIRECTORY = new PropertyDescriptor.Builder()
+ .name("Create Directory")
+ .description("Specifies whether or not the remote directory should be created if it does not exist.")
+ .required(true)
+ .allowableValues("true", "false")
+ .defaultValue("false")
+ .build();
+
+ public static final PropertyDescriptor USE_COMPRESSION = new PropertyDescriptor.Builder()
+ .name("Use Compression")
+ .description("Indicates whether or not ZLIB compression should be used when transferring files")
+ .allowableValues("true", "false")
+ .defaultValue("false")
+ .required(true)
+ .build();
// GET-specific properties
- public static final PropertyDescriptor RECURSIVE_SEARCH = new PropertyDescriptor.Builder().
- name("Search Recursively").
- description("If true, will pull files from arbitrarily nested subdirectories; otherwise, will not traverse subdirectories").
- required(true).
- defaultValue("false").
- allowableValues("true", "false").
- build();
- public static final PropertyDescriptor FILE_FILTER_REGEX = new PropertyDescriptor.Builder().
- name("File Filter Regex").
- description("Provides a Java Regular Expression for filtering Filenames; if a filter is supplied, only files whose names match that Regular Expression will be fetched").
- required(false).
- addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR).
- build();
- public static final PropertyDescriptor PATH_FILTER_REGEX = new PropertyDescriptor.Builder().
- name("Path Filter Regex").
- description("When " + RECURSIVE_SEARCH.getName() + " is true, then only subdirectories whose path matches the given Regular Expression will be scanned").
- required(false).
- addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR).
- build();
- public static final PropertyDescriptor MAX_SELECTS = new PropertyDescriptor.Builder().
- name("Max Selects").
- description("The maximum number of files to pull in a single connection").
- defaultValue("100").
- required(true).
- addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR).
- build();
- public static final PropertyDescriptor REMOTE_POLL_BATCH_SIZE = new PropertyDescriptor.Builder().
- name("Remote Poll Batch Size").
- description("The value specifies how many file paths to find in a given directory on the remote system when doing a file listing. This value in general should not need to be modified but when polling against a remote system with a tremendous number of files this value can be critical. Setting this value too high can result very poor performance and setting it too low can cause the flow to be slower than normal.").
- defaultValue("5000").
- addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR).
- required(true).
- build();
- public static final PropertyDescriptor DELETE_ORIGINAL = new PropertyDescriptor.Builder().
- name("Delete Original").
- description("Determines whether or not the file is deleted from the remote system after it has been successfully transferred").
- defaultValue("true").
- allowableValues("true", "false").
- required(true).
- build();
- public static final PropertyDescriptor POLLING_INTERVAL = new PropertyDescriptor.Builder().
- name("Polling Interval").
- description("Determines how long to wait between fetching the listing for new files").
- addValidator(StandardValidators.TIME_PERIOD_VALIDATOR).
- required(true).
- defaultValue("60 sec").
- build();
- public static final PropertyDescriptor IGNORE_DOTTED_FILES = new PropertyDescriptor.Builder().
- name("Ignore Dotted Files").
- description("If true, files whose names begin with a dot (\".\") will be ignored").
- allowableValues("true", "false").
- defaultValue("true").
- required(true).
- build();
- public static final PropertyDescriptor USE_NATURAL_ORDERING = new PropertyDescriptor.Builder().
- name("Use Natural Ordering").
- description("If true, will pull files in the order in which they are naturally listed; otherwise, the order in which the files will be pulled is not defined").
- allowableValues("true", "false").
- defaultValue("false").
- required(true).
- build();
+ public static final PropertyDescriptor RECURSIVE_SEARCH = new PropertyDescriptor.Builder()
+ .name("Search Recursively")
+ .description("If true, will pull files from arbitrarily nested subdirectories; otherwise, will not traverse subdirectories")
+ .required(true)
+ .defaultValue("false")
+ .allowableValues("true", "false")
+ .build();
+ public static final PropertyDescriptor FILE_FILTER_REGEX = new PropertyDescriptor.Builder()
+ .name("File Filter Regex")
+ .description("Provides a Java Regular Expression for filtering Filenames; if a filter is supplied, only files whose names match that Regular Expression will be fetched")
+ .required(false)
+ .addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor PATH_FILTER_REGEX = new PropertyDescriptor.Builder()
+ .name("Path Filter Regex")
+ .description("When " + RECURSIVE_SEARCH.getName() + " is true, then only subdirectories whose path matches the given Regular Expression will be scanned")
+ .required(false)
+ .addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor MAX_SELECTS = new PropertyDescriptor.Builder()
+ .name("Max Selects")
+ .description("The maximum number of files to pull in a single connection")
+ .defaultValue("100")
+ .required(true)
+ .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor REMOTE_POLL_BATCH_SIZE = new PropertyDescriptor.Builder()
+ .name("Remote Poll Batch Size")
+ .description("The value specifies how many file paths to find in a given directory on the remote system when doing a file listing. This value in general should not need to be modified but when polling against a remote system with a tremendous number of files this value can be critical. Setting this value too high can result very poor performance and setting it too low can cause the flow to be slower than normal.")
+ .defaultValue("5000")
+ .addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR)
+ .required(true)
+ .build();
+ public static final PropertyDescriptor DELETE_ORIGINAL = new PropertyDescriptor.Builder()
+ .name("Delete Original")
+ .description("Determines whether or not the file is deleted from the remote system after it has been successfully transferred")
+ .defaultValue("true")
+ .allowableValues("true", "false")
+ .required(true)
+ .build();
+ public static final PropertyDescriptor POLLING_INTERVAL = new PropertyDescriptor.Builder()
+ .name("Polling Interval")
+ .description("Determines how long to wait between fetching the listing for new files")
+ .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
+ .required(true)
+ .defaultValue("60 sec")
+ .build();
+ public static final PropertyDescriptor IGNORE_DOTTED_FILES = new PropertyDescriptor.Builder()
+ .name("Ignore Dotted Files")
+ .description("If true, files whose names begin with a dot (\".\") will be ignored")
+ .allowableValues("true", "false")
+ .defaultValue("true")
+ .required(true)
+ .build();
+ public static final PropertyDescriptor USE_NATURAL_ORDERING = new PropertyDescriptor.Builder()
+ .name("Use Natural Ordering")
+ .description("If true, will pull files in the order in which they are naturally listed; otherwise, the order in which the files will be pulled is not defined")
+ .allowableValues("true", "false")
+ .defaultValue("false")
+ .required(true)
+ .build();
// PUT-specific properties
public static final String FILE_MODIFY_DATE_ATTR_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ";
@@ -179,66 +179,66 @@ public interface FileTransfer extends Closeable {
public static final String CONFLICT_RESOLUTION_REJECT = "REJECT";
public static final String CONFLICT_RESOLUTION_FAIL = "FAIL";
public static final String CONFLICT_RESOLUTION_NONE = "NONE";
- public static final PropertyDescriptor CONFLICT_RESOLUTION = new PropertyDescriptor.Builder().
- name("Conflict Resolution").
- description("Determines how to handle the problem of filename collisions").
- required(true).
- allowableValues(CONFLICT_RESOLUTION_REPLACE, CONFLICT_RESOLUTION_IGNORE, CONFLICT_RESOLUTION_RENAME, CONFLICT_RESOLUTION_REJECT, CONFLICT_RESOLUTION_FAIL, CONFLICT_RESOLUTION_NONE).
- defaultValue(CONFLICT_RESOLUTION_NONE).
- build();
- public static final PropertyDescriptor REJECT_ZERO_BYTE = new PropertyDescriptor.Builder().
- name("Reject Zero-Byte Files").
- description("Determines whether or not Zero-byte files should be rejected without attempting to transfer").
- allowableValues("true", "false").
- defaultValue("true").
- build();
- public static final PropertyDescriptor DOT_RENAME = new PropertyDescriptor.Builder().
- name("Dot Rename").
- description("If true, then the filename of the sent file is prepended with a \".\" and then renamed back to the original once the file is completely sent. Otherwise, there is no rename. This property is ignored if the Temporary Filename property is set.").
- allowableValues("true", "false").
- defaultValue("true").
- build();
- public static final PropertyDescriptor TEMP_FILENAME = new PropertyDescriptor.Builder().
- name("Temporary Filename").
- description("If set, the filename of the sent file will be equal to the value specified during the transfer and after successful completion will be renamed to the original filename. If this value is set, the Dot Rename property is ignored.").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- required(false).
- build();
- public static final PropertyDescriptor LAST_MODIFIED_TIME = new PropertyDescriptor.Builder().
- name("Last Modified Time").
- description("The lastModifiedTime to assign to the file after transferring it. If not set, the lastModifiedTime will not be changed. Format must be yyyy-MM-dd'T'HH:mm:ssZ. You may also use expression language such as ${file.lastModifiedTime}. If the value is invalid, the processor will not be invalid but will fail to change lastModifiedTime of the file.").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor PERMISSIONS = new PropertyDescriptor.Builder().
- name("Permissions").
- description("The permissions to assign to the file after transferring it. Format must be either UNIX rwxrwxrwx with a - in place of denied permissions (e.g. rw-r--r--) or an octal number (e.g. 644). If not set, the permissions will not be changed. You may also use expression language such as ${file.permissions}. If the value is invalid, the processor will not be invalid but will fail to change permissions of the file.").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor REMOTE_OWNER = new PropertyDescriptor.Builder().
- name("Remote Owner").
- description("Integer value representing the User ID to set on the file after transferring it. If not set, the owner will not be set. You may also use expression language such as ${file.owner}. If the value is invalid, the processor will not be invalid but will fail to change the owner of the file.").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor REMOTE_GROUP = new PropertyDescriptor.Builder().
- name("Remote Group").
- description("Integer value representing the Group ID to set on the file after transferring it. If not set, the group will not be set. You may also use expression language such as ${file.group}. If the value is invalid, the processor will not be invalid but will fail to change the group of the file.").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor BATCH_SIZE = new PropertyDescriptor.Builder().
- name("Batch Size").
- description("The maximum number of FlowFiles to send in a single connection").
- required(true).
- addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR).
- defaultValue("500").
- build();
+ public static final PropertyDescriptor CONFLICT_RESOLUTION = new PropertyDescriptor.Builder()
+ .name("Conflict Resolution")
+ .description("Determines how to handle the problem of filename collisions")
+ .required(true)
+ .allowableValues(CONFLICT_RESOLUTION_REPLACE, CONFLICT_RESOLUTION_IGNORE, CONFLICT_RESOLUTION_RENAME, CONFLICT_RESOLUTION_REJECT, CONFLICT_RESOLUTION_FAIL, CONFLICT_RESOLUTION_NONE)
+ .defaultValue(CONFLICT_RESOLUTION_NONE)
+ .build();
+ public static final PropertyDescriptor REJECT_ZERO_BYTE = new PropertyDescriptor.Builder()
+ .name("Reject Zero-Byte Files")
+ .description("Determines whether or not Zero-byte files should be rejected without attempting to transfer")
+ .allowableValues("true", "false")
+ .defaultValue("true")
+ .build();
+ public static final PropertyDescriptor DOT_RENAME = new PropertyDescriptor.Builder()
+ .name("Dot Rename")
+ .description("If true, then the filename of the sent file is prepended with a \".\" and then renamed back to the original once the file is completely sent. Otherwise, there is no rename. This property is ignored if the Temporary Filename property is set.")
+ .allowableValues("true", "false")
+ .defaultValue("true")
+ .build();
+ public static final PropertyDescriptor TEMP_FILENAME = new PropertyDescriptor.Builder()
+ .name("Temporary Filename")
+ .description("If set, the filename of the sent file will be equal to the value specified during the transfer and after successful completion will be renamed to the original filename. If this value is set, the Dot Rename property is ignored.")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .required(false)
+ .build();
+ public static final PropertyDescriptor LAST_MODIFIED_TIME = new PropertyDescriptor.Builder()
+ .name("Last Modified Time")
+ .description("The lastModifiedTime to assign to the file after transferring it. If not set, the lastModifiedTime will not be changed. Format must be yyyy-MM-dd'T'HH:mm:ssZ. You may also use expression language such as ${file.lastModifiedTime}. If the value is invalid, the processor will not be invalid but will fail to change lastModifiedTime of the file.")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor PERMISSIONS = new PropertyDescriptor.Builder()
+ .name("Permissions")
+ .description("The permissions to assign to the file after transferring it. Format must be either UNIX rwxrwxrwx with a - in place of denied permissions (e.g. rw-r--r--) or an octal number (e.g. 644). If not set, the permissions will not be changed. You may also use expression language such as ${file.permissions}. If the value is invalid, the processor will not be invalid but will fail to change permissions of the file.")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor REMOTE_OWNER = new PropertyDescriptor.Builder()
+ .name("Remote Owner")
+ .description("Integer value representing the User ID to set on the file after transferring it. If not set, the owner will not be set. You may also use expression language such as ${file.owner}. If the value is invalid, the processor will not be invalid but will fail to change the owner of the file.")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor REMOTE_GROUP = new PropertyDescriptor.Builder()
+ .name("Remote Group")
+ .description("Integer value representing the Group ID to set on the file after transferring it. If not set, the group will not be set. You may also use expression language such as ${file.group}. If the value is invalid, the processor will not be invalid but will fail to change the group of the file.")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor BATCH_SIZE = new PropertyDescriptor.Builder()
+ .name("Batch Size")
+ .description("The maximum number of FlowFiles to send in a single connection")
+ .required(true)
+ .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
+ .defaultValue("500")
+ .build();
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
index 0f50cdf..35a65dc 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
@@ -104,13 +104,9 @@ public class JmsFactory {
final ConnectionFactory connectionFactory = createConnectionFactory(context);
- final String username = context.getProperty(USERNAME).
- getValue();
- final String password = context.getProperty(PASSWORD).
- getValue();
- final Connection connection = (username == null && password == null) ? connectionFactory.
- createConnection()
- : connectionFactory.createConnection(username, password);
+ final String username = context.getProperty(USERNAME).getValue();
+ final String password = context.getProperty(PASSWORD).getValue();
+ final Connection connection = (username == null && password == null) ? connectionFactory.createConnection() : connectionFactory.createConnection(username, password);
connection.setClientID(clientId);
connection.start();
@@ -119,17 +115,12 @@ public class JmsFactory {
public static Connection createConnection(final String url, final String jmsProvider, final String username, final String password, final int timeoutMillis) throws JMSException {
final ConnectionFactory connectionFactory = createConnectionFactory(url, timeoutMillis, jmsProvider);
- return (username == null && password == null) ? connectionFactory.
- createConnection() : connectionFactory.
- createConnection(username, password);
+ return (username == null && password == null) ? connectionFactory.createConnection() : connectionFactory.createConnection(username, password);
}
public static String createClientId(final ProcessContext context) {
- final String clientIdPrefix = context.getProperty(CLIENT_ID_PREFIX).
- getValue();
- return CLIENT_ID_FIXED_PREFIX + (clientIdPrefix == null ? "" : clientIdPrefix) + "-" + UUID.
- randomUUID().
- toString();
+ final String clientIdPrefix = context.getProperty(CLIENT_ID_PREFIX).getValue();
+ return CLIENT_ID_FIXED_PREFIX + (clientIdPrefix == null ? "" : clientIdPrefix) + "-" + UUID.randomUUID().toString();
}
public static boolean clientIdPrefixEquals(final String one, final String two) {
@@ -138,14 +129,11 @@ public class JmsFactory {
} else if (two == null) {
return false;
}
- int uuidLen = UUID.randomUUID().
- toString().
- length();
+ int uuidLen = UUID.randomUUID().toString().length();
if (one.length() <= uuidLen || two.length() <= uuidLen) {
return false;
}
- return one.substring(0, one.length() - uuidLen).
- equals(two.substring(0, two.length() - uuidLen));
+ return one.substring(0, one.length() - uuidLen).equals(two.substring(0, two.length() - uuidLen));
}
public static byte[] createByteArray(final Message message) throws JMSException {
@@ -164,8 +152,7 @@ public class JmsFactory {
}
private static byte[] getMessageBytes(TextMessage message) throws JMSException {
- return (message.getText() == null) ? new byte[0] : message.getText().
- getBytes();
+ return (message.getText() == null) ? new byte[0] : message.getText().getBytes();
}
private static byte[] getMessageBytes(BytesMessage message) throws JMSException {
@@ -204,8 +191,7 @@ public class JmsFactory {
String key = (String) elements.nextElement();
map.put(key, message.getString(key));
}
- return map.toString().
- getBytes();
+ return map.toString().getBytes();
}
private static byte[] getMessageBytes(ObjectMessage message) throws JMSException {
@@ -224,9 +210,7 @@ public class JmsFactory {
}
public static Session createSession(final ProcessContext context, final Connection connection, final boolean transacted) throws JMSException {
- final String configuredAckMode = context.
- getProperty(ACKNOWLEDGEMENT_MODE).
- getValue();
+ final String configuredAckMode = context.getProperty(ACKNOWLEDGEMENT_MODE).getValue();
return createSession(connection, configuredAckMode, transacted);
}
@@ -247,14 +231,11 @@ public class JmsFactory {
Session jmsSession = null;
try {
connection = JmsFactory.createConnection(context);
- jmsSession = JmsFactory.
- createSession(context, connection, DEFAULT_IS_TRANSACTED);
+ jmsSession = JmsFactory.createSession(context, connection, DEFAULT_IS_TRANSACTED);
- final String messageSelector = context.getProperty(MESSAGE_SELECTOR).
- getValue();
+ final String messageSelector = context.getProperty(MESSAGE_SELECTOR).getValue();
final Destination destination = createQueue(context);
- final MessageConsumer messageConsumer = jmsSession.
- createConsumer(destination, messageSelector, false);
+ final MessageConsumer messageConsumer = jmsSession.createConsumer(destination, messageSelector, false);
return new WrappedMessageConsumer(connection, jmsSession, messageConsumer);
} catch (JMSException e) {
@@ -280,20 +261,15 @@ public class JmsFactory {
Session jmsSession = null;
try {
connection = JmsFactory.createConnection(context, clientId);
- jmsSession = JmsFactory.
- createSession(context, connection, DEFAULT_IS_TRANSACTED);
+ jmsSession = JmsFactory.createSession(context, connection, DEFAULT_IS_TRANSACTED);
- final String messageSelector = context.getProperty(MESSAGE_SELECTOR).
- getValue();
+ final String messageSelector = context.getProperty(MESSAGE_SELECTOR).getValue();
final Topic topic = createTopic(context);
final MessageConsumer messageConsumer;
- if (context.getProperty(DURABLE_SUBSCRIPTION).
- asBoolean()) {
- messageConsumer = jmsSession.
- createDurableSubscriber(topic, clientId, messageSelector, false);
+ if (context.getProperty(DURABLE_SUBSCRIPTION).asBoolean()) {
+ messageConsumer = jmsSession.createDurableSubscriber(topic, clientId, messageSelector, false);
} else {
- messageConsumer = jmsSession.
- createConsumer(topic, messageSelector, false);
+ messageConsumer = jmsSession.createConsumer(topic, messageSelector, false);
}
return new WrappedMessageConsumer(connection, jmsSession, messageConsumer);
@@ -309,8 +285,7 @@ public class JmsFactory {
}
private static Destination getDestination(final ProcessContext context) throws JMSException {
- final String destinationType = context.getProperty(DESTINATION_TYPE).
- getValue();
+ final String destinationType = context.getProperty(DESTINATION_TYPE).getValue();
switch (destinationType) {
case DESTINATION_TYPE_TOPIC:
return createTopic(context);
@@ -330,12 +305,10 @@ public class JmsFactory {
try {
connection = JmsFactory.createConnection(context);
- jmsSession = JmsFactory.
- createSession(context, connection, transacted);
+ jmsSession = JmsFactory.createSession(context, connection, transacted);
final Destination destination = getDestination(context);
- final MessageProducer messageProducer = jmsSession.
- createProducer(destination);
+ final MessageProducer messageProducer = jmsSession.createProducer(destination);
return new WrappedMessageProducer(connection, jmsSession, messageProducer);
} catch (JMSException e) {
@@ -350,13 +323,11 @@ public class JmsFactory {
}
public static Destination createQueue(final ProcessContext context) {
- return createQueue(context, context.getProperty(DESTINATION_NAME).
- getValue());
+ return createQueue(context, context.getProperty(DESTINATION_NAME).getValue());
}
public static Queue createQueue(final ProcessContext context, final String queueName) {
- return createQueue(context.getProperty(JMS_PROVIDER).
- getValue(), queueName);
+ return createQueue(context.getProperty(JMS_PROVIDER).getValue(), queueName);
}
public static Queue createQueue(final String jmsProvider, final String queueName) {
@@ -368,10 +339,8 @@ public class JmsFactory {
}
private static Topic createTopic(final ProcessContext context) {
- final String topicName = context.getProperty(DESTINATION_NAME).
- getValue();
- switch (context.getProperty(JMS_PROVIDER).
- getValue()) {
+ final String topicName = context.getProperty(DESTINATION_NAME).getValue();
+ switch (context.getProperty(JMS_PROVIDER).getValue()) {
case ACTIVEMQ_PROVIDER:
default:
return new ActiveMQTopic(topicName);
@@ -379,13 +348,9 @@ public class JmsFactory {
}
private static ConnectionFactory createConnectionFactory(final ProcessContext context) throws JMSException {
- final String url = context.getProperty(URL).
- getValue();
- final int timeoutMillis = context.getProperty(TIMEOUT).
- asTimePeriod(TimeUnit.MILLISECONDS).
- intValue();
- final String provider = context.getProperty(JMS_PROVIDER).
- getValue();
+ final String url = context.getProperty(URL).getValue();
+ final int timeoutMillis = context.getProperty(TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue();
+ final String provider = context.getProperty(JMS_PROVIDER).getValue();
return createConnectionFactory(url, timeoutMillis, provider);
}
@@ -412,8 +377,7 @@ public class JmsFactory {
if (value == null) {
attributes.put(ATTRIBUTE_PREFIX + propName, "");
- attributes.
- put(ATTRIBUTE_PREFIX + propName + ATTRIBUTE_TYPE_SUFFIX, "Unknown");
+ attributes.put(ATTRIBUTE_PREFIX + propName + ATTRIBUTE_TYPE_SUFFIX, "Unknown");
continue;
}
@@ -441,42 +405,30 @@ public class JmsFactory {
propType = PROP_TYPE_OBJECT;
}
- attributes.
- put(ATTRIBUTE_PREFIX + propName + ATTRIBUTE_TYPE_SUFFIX, propType);
+ attributes.put(ATTRIBUTE_PREFIX + propName + ATTRIBUTE_TYPE_SUFFIX, propType);
}
if (message.getJMSCorrelationID() != null) {
- attributes.put(ATTRIBUTE_PREFIX + JMS_CORRELATION_ID, message.
- getJMSCorrelationID());
+ attributes.put(ATTRIBUTE_PREFIX + JMS_CORRELATION_ID, message.getJMSCorrelationID());
}
if (message.getJMSDestination() != null) {
- attributes.put(ATTRIBUTE_PREFIX + JMS_DESTINATION, message.
- getJMSDestination().
- toString());
+ attributes.put(ATTRIBUTE_PREFIX + JMS_DESTINATION, message.getJMSDestination().toString());
}
if (message.getJMSMessageID() != null) {
- attributes.put(ATTRIBUTE_PREFIX + JMS_MESSAGE_ID, message.
- getJMSMessageID());
+ attributes.put(ATTRIBUTE_PREFIX + JMS_MESSAGE_ID, message.getJMSMessageID());
}
if (message.getJMSReplyTo() != null) {
- attributes.put(ATTRIBUTE_PREFIX + JMS_REPLY_TO, message.
- getJMSReplyTo().
- toString());
+ attributes.put(ATTRIBUTE_PREFIX + JMS_REPLY_TO, message.getJMSReplyTo().toString());
}
if (message.getJMSType() != null) {
attributes.put(ATTRIBUTE_PREFIX + JMS_TYPE, message.getJMSType());
}
- attributes.put(ATTRIBUTE_PREFIX + JMS_DELIVERY_MODE, String.
- valueOf(message.getJMSDeliveryMode()));
- attributes.put(ATTRIBUTE_PREFIX + JMS_EXPIRATION, String.
- valueOf(message.getJMSExpiration()));
- attributes.put(ATTRIBUTE_PREFIX + JMS_PRIORITY, String.valueOf(message.
- getJMSPriority()));
- attributes.put(ATTRIBUTE_PREFIX + JMS_REDELIVERED, String.
- valueOf(message.getJMSRedelivered()));
- attributes.put(ATTRIBUTE_PREFIX + JMS_TIMESTAMP, String.valueOf(message.
- getJMSTimestamp()));
+ attributes.put(ATTRIBUTE_PREFIX + JMS_DELIVERY_MODE, String.valueOf(message.getJMSDeliveryMode()));
+ attributes.put(ATTRIBUTE_PREFIX + JMS_EXPIRATION, String.valueOf(message.getJMSExpiration()));
+ attributes.put(ATTRIBUTE_PREFIX + JMS_PRIORITY, String.valueOf(message.getJMSPriority()));
+ attributes.put(ATTRIBUTE_PREFIX + JMS_REDELIVERED, String.valueOf(message.getJMSRedelivered()));
+ attributes.put(ATTRIBUTE_PREFIX + JMS_TIMESTAMP, String.valueOf(message.getJMSTimestamp()));
return attributes;
}
}
[05/12] incubator-nifi git commit: NIFI-271
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
index 99d5858..aae4411 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
@@ -43,8 +43,7 @@ import org.junit.Test;
public class TestEvaluateXQuery {
- private static final Path XML_SNIPPET = Paths.
- get("src/test/resources/TestXml/fruit.xml");
+ private static final Path XML_SNIPPET = Paths.get("src/test/resources/TestXml/fruit.xml");
private static final String[] fruitNames = {"apple", "apple", "banana", "orange", "blueberry", "raspberry", "none"};
private static final String[] methods = {EvaluateXQuery.OUTPUT_METHOD_XML, EvaluateXQuery.OUTPUT_METHOD_HTML, EvaluateXQuery.OUTPUT_METHOD_TEXT};
@@ -56,15 +55,11 @@ public class TestEvaluateXQuery {
for (int i = 0; i < methods.length; i++) {
for (int j = 0; j < booleans.length; j++) {
for (int k = 0; k < booleans.length; k++) {
- Properties props = EvaluateXQuery.
- getTransformerProperties(methods[i], booleans[j], booleans[k]);
+ Properties props = EvaluateXQuery.getTransformerProperties(methods[i], booleans[j], booleans[k]);
assertEquals(3, props.size());
- assertEquals(methods[i], props.
- getProperty(OutputKeys.METHOD));
- assertEquals(booleans[j] ? "yes" : "no", props.
- getProperty(OutputKeys.INDENT));
- assertEquals(booleans[k] ? "yes" : "no", props.
- getProperty(OutputKeys.OMIT_XML_DECLARATION));
+ assertEquals(methods[i], props.getProperty(OutputKeys.METHOD));
+ assertEquals(booleans[j] ? "yes" : "no", props.getProperty(OutputKeys.INDENT));
+ assertEquals(booleans[k] ? "yes" : "no", props.getProperty(OutputKeys.OMIT_XML_DECLARATION));
}
}
}
@@ -162,14 +157,10 @@ public class TestEvaluateXQuery {
List<String> resultStrings = new ArrayList<>();
runnerProps.clear();
- runnerProps.
- put(EvaluateXQuery.DESTINATION.getName(), EvaluateXQuery.DESTINATION_CONTENT);
+ runnerProps.put(EvaluateXQuery.DESTINATION.getName(), EvaluateXQuery.DESTINATION_CONTENT);
runnerProps.put(EvaluateXQuery.XML_OUTPUT_METHOD.getName(), method);
- runnerProps.put(EvaluateXQuery.XML_OUTPUT_INDENT.getName(), Boolean.
- toString(indent));
- runnerProps.
- put(EvaluateXQuery.XML_OUTPUT_OMIT_XML_DECLARATION.getName(), Boolean.
- toString(omitDeclaration));
+ runnerProps.put(EvaluateXQuery.XML_OUTPUT_INDENT.getName(), Boolean.toString(indent));
+ runnerProps.put(EvaluateXQuery.XML_OUTPUT_OMIT_XML_DECLARATION.getName(), Boolean.toString(omitDeclaration));
runnerProps.put("xquery", xQuery);
resultFlowFiles = runXquery(xml, runnerProps);
@@ -185,26 +176,22 @@ public class TestEvaluateXQuery {
@Test(expected = java.lang.AssertionError.class)
public void testBadXQuery() throws Exception {
- doXqueryTest(XML_SNIPPET, "counttttttt(*:fruitbasket/fruit)", Arrays.
- asList("7"));
+ doXqueryTest(XML_SNIPPET, "counttttttt(*:fruitbasket/fruit)", Arrays.asList("7"));
}
@Test
public void testXQueries() throws Exception {
/* count matches */
- doXqueryTest(XML_SNIPPET, "count(*:fruitbasket/fruit)", Arrays.
- asList("7"));
+ doXqueryTest(XML_SNIPPET, "count(*:fruitbasket/fruit)", Arrays.asList("7"));
doXqueryTest(XML_SNIPPET, "count(//fruit)", Arrays.asList("7"));
/* Using a namespace */
- doXqueryTest(XML_SNIPPET, "declare namespace fb = \"http://namespace/1\"; count(fb:fruitbasket/fruit)", Arrays.
- asList("7"));
+ doXqueryTest(XML_SNIPPET, "declare namespace fb = \"http://namespace/1\"; count(fb:fruitbasket/fruit)", Arrays.asList("7"));
/* determine if node exists */
doXqueryTest(XML_SNIPPET, "boolean(//fruit[1])", Arrays.asList("true"));
- doXqueryTest(XML_SNIPPET, "boolean(//fruit[100])", Arrays.
- asList("false"));
+ doXqueryTest(XML_SNIPPET, "boolean(//fruit[100])", Arrays.asList("false"));
/* XML first match */
doXqueryTest(XML_SNIPPET, "//fruit[1]", Arrays.asList(
@@ -242,16 +229,13 @@ public class TestEvaluateXQuery {
+ "</wrap>"));
/* String all matches fruit names*/
- doXqueryTest(XML_SNIPPET, "for $x in //fruit return $x/name/text()", Arrays.
- asList(fruitNames));
+ doXqueryTest(XML_SNIPPET, "for $x in //fruit return $x/name/text()", Arrays.asList(fruitNames));
/* String first match fruit name (XPath)*/
- doXqueryTest(XML_SNIPPET, "//fruit[1]/name/text()", Arrays.
- asList("apple"));
+ doXqueryTest(XML_SNIPPET, "//fruit[1]/name/text()", Arrays.asList("apple"));
/* String first match fruit color (XPath)*/
- doXqueryTest(XML_SNIPPET, "//fruit[1]/color/text()", Arrays.
- asList("red"));
+ doXqueryTest(XML_SNIPPET, "//fruit[1]/color/text()", Arrays.asList("red"));
/* String first match fruit name (XQuery)*/
doXqueryTest(XML_SNIPPET, "for $x in //fruit[1] return string-join(($x/name/text() , $x/color/text()), ' - ')",
@@ -296,31 +280,25 @@ public class TestEvaluateXQuery {
/* String all matches name only, comma delimited (one result)*/
doXqueryTest(XML_SNIPPET, "string-join((for $x in //fruit return $x/name/text()), ', ')",
- Arrays.
- asList("apple, apple, banana, orange, blueberry, raspberry, none"));
+ Arrays.asList("apple, apple, banana, orange, blueberry, raspberry, none"));
/* String all matches color and name, comma delimited (one result)*/
doXqueryTest(XML_SNIPPET, "string-join((for $y in (for $x in //fruit return string-join(($x/color/text() , $x/name/text()), ' ')) return $y), ', ')",
- Arrays.
- asList("red apple, green apple, yellow banana, orange orange, blue blueberry, red raspberry, none"));
+ Arrays.asList("red apple, green apple, yellow banana, orange orange, blue blueberry, red raspberry, none"));
/* String all matches color and name, comma delimited using let(one result)*/
doXqueryTest(XML_SNIPPET, "string-join((for $y in (for $x in //fruit let $d := string-join(($x/color/text() , $x/name/text()), ' ') return $d) return $y), ', ')",
- Arrays.
- asList("red apple, green apple, yellow banana, orange orange, blue blueberry, red raspberry, none"));
+ Arrays.asList("red apple, green apple, yellow banana, orange orange, blue blueberry, red raspberry, none"));
/* Query for attribute */
- doXqueryTest(XML_SNIPPET, "string(//fruit[1]/@taste)", Arrays.
- asList("crisp"));
+ doXqueryTest(XML_SNIPPET, "string(//fruit[1]/@taste)", Arrays.asList("crisp"));
/* Query for comment */
- doXqueryTest(XML_SNIPPET, "//fruit/comment()", Arrays.
- asList(" Apples are my favorite "));
+ doXqueryTest(XML_SNIPPET, "//fruit/comment()", Arrays.asList(" Apples are my favorite "));
/* Query for processing instruction */
- doXqueryTest(XML_SNIPPET, "//processing-instruction()[name()='xml-stylesheet']", Arrays.
- asList("type=\"text/xsl\" href=\"foo.xsl\""));
+ doXqueryTest(XML_SNIPPET, "//processing-instruction()[name()='xml-stylesheet']", Arrays.asList("type=\"text/xsl\" href=\"foo.xsl\""));
}
@@ -332,8 +310,7 @@ public class TestEvaluateXQuery {
// test read from content, write to attribute
{
runnerProps.clear();
- runnerProps.
- put(EvaluateXQuery.DESTINATION.getName(), EvaluateXQuery.DESTINATION_ATTRIBUTE);
+ runnerProps.put(EvaluateXQuery.DESTINATION.getName(), EvaluateXQuery.DESTINATION_ATTRIBUTE);
runnerProps.put("xquery", xQuery);
resultFlowFiles = runXquery(xml, runnerProps);
@@ -346,10 +323,8 @@ public class TestEvaluateXQuery {
if (expectedResults.size() > 1) {
key += "." + ((int) i + 1);
}
- final String actual = out.getAttribute(key).
- replaceAll(">\\s+<", "><");
- final String expected = expectedResults.get(i).
- replaceAll(">\\s+<", "><");
+ final String actual = out.getAttribute(key).replaceAll(">\\s+<", "><");
+ final String expected = expectedResults.get(i).replaceAll(">\\s+<", "><");
assertEquals(expected, actual);
}
}
@@ -357,8 +332,7 @@ public class TestEvaluateXQuery {
// test read from content, write to content
{
runnerProps.clear();
- runnerProps.
- put(EvaluateXQuery.DESTINATION.getName(), EvaluateXQuery.DESTINATION_CONTENT);
+ runnerProps.put(EvaluateXQuery.DESTINATION.getName(), EvaluateXQuery.DESTINATION_CONTENT);
runnerProps.put("xquery", xQuery);
resultFlowFiles = runXquery(xml, runnerProps);
@@ -368,11 +342,9 @@ public class TestEvaluateXQuery {
final MockFlowFile out = resultFlowFiles.get(i);
final byte[] outData = out.toByteArray();
- final String outXml = new String(outData, "UTF-8").
- replaceAll(">\\s+<", "><");
+ final String outXml = new String(outData, "UTF-8").replaceAll(">\\s+<", "><");
final String actual = outXml;
- final String expected = expectedResults.get(i).
- replaceAll(">\\s+<", "><");
+ final String expected = expectedResults.get(i).replaceAll(">\\s+<", "><");
assertEquals(expected, actual);
}
}
@@ -384,8 +356,7 @@ public class TestEvaluateXQuery {
private List<MockFlowFile> runXquery(Path xml, Map<String, String> runnerProps, Map<String, String> flowFileAttributes) throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
for (Entry<String, String> entry : runnerProps.entrySet()) {
testRunner.setProperty(entry.getKey(), entry.getValue());
@@ -401,109 +372,81 @@ public class TestEvaluateXQuery {
@Test
public void testRootPath() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
testRunner.setProperty("xquery.result1", "/");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0);
- final String attributeString = out.getAttribute("xquery.result1").
- replaceAll(">\\s+<", "><");
- final String xmlSnippetString = new String(Files.
- readAllBytes(XML_SNIPPET), "UTF-8").replaceAll(">\\s+<", "><");
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0);
+ final String attributeString = out.getAttribute("xquery.result1").replaceAll(">\\s+<", "><");
+ final String xmlSnippetString = new String(Files.readAllBytes(XML_SNIPPET), "UTF-8").replaceAll(">\\s+<", "><");
assertEquals(xmlSnippetString, attributeString);
}
@Test
public void testCheckIfElementExists() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
- testRunner.
- setProperty("xquery.result.exist.1", "boolean(/*:fruitbasket/fruit[1])");
- testRunner.
- setProperty("xquery.result.exist.2", "boolean(/*:fruitbasket/fruit[100])");
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
+ testRunner.setProperty("xquery.result.exist.1", "boolean(/*:fruitbasket/fruit[1])");
+ testRunner.setProperty("xquery.result.exist.2", "boolean(/*:fruitbasket/fruit[100])");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0);
out.assertAttributeEquals("xquery.result.exist.1", "true");
out.assertAttributeEquals("xquery.result.exist.2", "false");
}
@Test
public void testUnmatchedContent() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
testRunner.setProperty("xquery.result.exist.2", "/*:fruitbasket/node2");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_NO_MATCH, 1);
- testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).
- get(0).
- assertContentEquals(XML_SNIPPET);
+ testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).get(0).assertContentEquals(XML_SNIPPET);
}
@Test
public void testUnmatchedAttribute() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
testRunner.setProperty("xquery.result.exist.2", "/*:fruitbasket/node2");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_NO_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).get(0);
out.assertAttributeEquals("xquery.result.exist.2", null);
- testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).
- get(0).
- assertContentEquals(XML_SNIPPET);
+ testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).get(0).assertContentEquals(XML_SNIPPET);
}
@Test
public void testNoXQueryAttribute() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_NO_MATCH, 1);
- testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).
- get(0).
- assertContentEquals(XML_SNIPPET);
+ testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).get(0).assertContentEquals(XML_SNIPPET);
}
@Test(expected = java.lang.AssertionError.class)
public void testNoXQueryContent() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
@@ -511,10 +454,8 @@ public class TestEvaluateXQuery {
@Test
public void testOneMatchOneUnmatchAttribute() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
testRunner.setProperty("some.property", "//fruit/name/text()");
testRunner.setProperty("xquery.result.exist.2", "/*:fruitbasket/node2");
@@ -523,51 +464,37 @@ public class TestEvaluateXQuery {
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0);
for (int i = 0; i < fruitNames.length; i++) {
- final String outXml = out.
- getAttribute("some.property." + ((int) i + 1));
+ final String outXml = out.getAttribute("some.property." + ((int) i + 1));
assertEquals(fruitNames[i], outXml.trim());
}
out.assertAttributeEquals("xquery.result.exist.2", null);
- testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0).
- assertContentEquals(XML_SNIPPET);
+ testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0).assertContentEquals(XML_SNIPPET);
}
@Test
public void testMatchedEmptyStringAttribute() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
- testRunner.
- setProperty("xquery.result.exist.2", "/*:fruitbasket/*[name='none']/color/text()");
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
+ testRunner.setProperty("xquery.result.exist.2", "/*:fruitbasket/*[name='none']/color/text()");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_NO_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).get(0);
out.assertAttributeEquals("xquery.result.exist.2", null);
- testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).
- get(0).
- assertContentEquals(XML_SNIPPET);
+ testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_NO_MATCH).get(0).assertContentEquals(XML_SNIPPET);
}
@Test(expected = java.lang.AssertionError.class)
public void testMultipleXPathForContent() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
testRunner.setProperty("some.property.1", "/*:fruitbasket/fruit[1]");
testRunner.setProperty("some.property.2", "/*:fruitbasket/fruit[2]");
@@ -577,98 +504,71 @@ public class TestEvaluateXQuery {
@Test
public void testWriteStringToAttribute() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
- testRunner.
- setProperty("xquery.result2", "/*:fruitbasket/fruit[1]/name/text()");
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
+ testRunner.setProperty("xquery.result2", "/*:fruitbasket/fruit[1]/name/text()");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0);
out.assertAttributeEquals("xquery.result2", "apple");
- testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0).
- assertContentEquals(XML_SNIPPET);
+ testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0).assertContentEquals(XML_SNIPPET);
}
@Test
public void testWriteStringToContent() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
- testRunner.
- setProperty("some.property", "/*:fruitbasket/fruit[1]/name/text()");
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
+ testRunner.setProperty("some.property", "/*:fruitbasket/fruit[1]/name/text()");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0);
final byte[] outData = testRunner.getContentAsByteArray(out);
final String outXml = new String(outData, "UTF-8");
- assertTrue(outXml.trim().
- equals("apple"));
+ assertTrue(outXml.trim().equals("apple"));
}
@Test
public void testWriteXmlToAttribute() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
testRunner.setProperty("some.property", "/*:fruitbasket/fruit[1]/name");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0);
final String outXml = out.getAttribute("some.property");
- assertTrue(outXml.
- contains("<name xmlns:ns=\"http://namespace/1\">apple</name>"));
- testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0).
- assertContentEquals(XML_SNIPPET);
+ assertTrue(outXml.contains("<name xmlns:ns=\"http://namespace/1\">apple</name>"));
+ testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0).assertContentEquals(XML_SNIPPET);
}
@Test
public void testWriteXmlToContent() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
testRunner.setProperty("some.property", "/*:fruitbasket/fruit[1]/name");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0);
final byte[] outData = testRunner.getContentAsByteArray(out);
final String outXml = new String(outData, "UTF-8");
- assertTrue(outXml.
- contains("<name xmlns:ns=\"http://namespace/1\">apple</name>"));
+ assertTrue(outXml.contains("<name xmlns:ns=\"http://namespace/1\">apple</name>"));
}
@Test
public void testMatchesMultipleStringContent() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
testRunner.setProperty("some.property", "//fruit/name/text()");
testRunner.enqueue(XML_SNIPPET);
@@ -676,8 +576,7 @@ public class TestEvaluateXQuery {
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_MATCH, 7);
- final List<MockFlowFile> flowFilesForRelMatch = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH);
+ final List<MockFlowFile> flowFilesForRelMatch = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH);
for (int i = 0; i < flowFilesForRelMatch.size(); i++) {
final MockFlowFile out = flowFilesForRelMatch.get(i);
@@ -689,10 +588,8 @@ public class TestEvaluateXQuery {
@Test
public void testMatchesMultipleStringAttribute() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
testRunner.setProperty("some.property", "//fruit/name/text()");
testRunner.enqueue(XML_SNIPPET);
@@ -700,26 +597,19 @@ public class TestEvaluateXQuery {
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0);
for (int i = 0; i < fruitNames.length; i++) {
- final String outXml = out.
- getAttribute("some.property." + ((int) i + 1));
+ final String outXml = out.getAttribute("some.property." + ((int) i + 1));
assertEquals(fruitNames[i], outXml.trim());
}
- testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0).
- assertContentEquals(XML_SNIPPET);
+ testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0).assertContentEquals(XML_SNIPPET);
}
@Test
public void testMatchesMultipleXmlContent() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_CONTENT);
testRunner.setProperty("some.property", "//fruit/name");
testRunner.enqueue(XML_SNIPPET);
@@ -727,8 +617,7 @@ public class TestEvaluateXQuery {
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_MATCH, 7);
- final List<MockFlowFile> flowFilesForRelMatch = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH);
+ final List<MockFlowFile> flowFilesForRelMatch = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH);
for (int i = 0; i < flowFilesForRelMatch.size(); i++) {
final MockFlowFile out = flowFilesForRelMatch.get(i);
@@ -741,10 +630,8 @@ public class TestEvaluateXQuery {
@Test
public void testMatchesMultipleXmlAttribute() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXQuery());
- testRunner.
- setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXQuery());
+ testRunner.setProperty(EvaluateXQuery.DESTINATION, EvaluateXQuery.DESTINATION_ATTRIBUTE);
testRunner.setProperty("some.property", "//fruit/name");
testRunner.enqueue(XML_SNIPPET);
@@ -752,18 +639,13 @@ public class TestEvaluateXQuery {
testRunner.assertAllFlowFilesTransferred(EvaluateXQuery.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0);
for (int i = 0; i < fruitNames.length; i++) {
- final String outXml = out.
- getAttribute("some.property." + ((int) i + 1));
+ final String outXml = out.getAttribute("some.property." + ((int) i + 1));
String expectedXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><name xmlns:ns=\"http://namespace/1\">" + fruitNames[i] + "</name>";
assertEquals(expectedXml, outXml.trim());
}
- testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).
- get(0).
- assertContentEquals(XML_SNIPPET);
+ testRunner.getFlowFilesForRelationship(EvaluateXQuery.REL_MATCH).get(0).assertContentEquals(XML_SNIPPET);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
index 0907f38..7529e6d 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
@@ -43,19 +43,16 @@ public class TestExecuteProcess {
assertEquals(1, singleArg.size());
assertEquals("hello", singleArg.get(0));
- final List<String> twoArg = ExecuteProcess.
- splitArgs(" hello good-bye ");
+ final List<String> twoArg = ExecuteProcess.splitArgs(" hello good-bye ");
assertEquals(2, twoArg.size());
assertEquals("hello", twoArg.get(0));
assertEquals("good-bye", twoArg.get(1));
- final List<String> singleQuotedArg = ExecuteProcess.
- splitArgs(" \"hello\" ");
+ final List<String> singleQuotedArg = ExecuteProcess.splitArgs(" \"hello\" ");
assertEquals(1, singleQuotedArg.size());
assertEquals("hello", singleQuotedArg.get(0));
- final List<String> twoQuotedArg = ExecuteProcess.
- splitArgs(" hello \"good bye\"");
+ final List<String> twoQuotedArg = ExecuteProcess.splitArgs(" hello \"good bye\"");
assertEquals(2, twoQuotedArg.size());
assertEquals("hello", twoQuotedArg.get(0));
assertEquals("good bye", twoQuotedArg.get(1));
@@ -63,19 +60,16 @@ public class TestExecuteProcess {
@Test
public void testEcho() {
- System.
- setProperty("org.slf4j.simpleLogger.log.org.apache.nifi", "TRACE");
+ System.setProperty("org.slf4j.simpleLogger.log.org.apache.nifi", "TRACE");
- final TestRunner runner = TestRunners.
- newTestRunner(ExecuteProcess.class);
+ final TestRunner runner = TestRunners.newTestRunner(ExecuteProcess.class);
runner.setProperty(ExecuteProcess.COMMAND, "echo");
runner.setProperty(ExecuteProcess.COMMAND_ARGUMENTS, "test-args");
runner.setProperty(ExecuteProcess.BATCH_DURATION, "500 millis");
runner.run();
- final List<MockFlowFile> flowFiles = runner.
- getFlowFilesForRelationship(ExecuteProcess.REL_SUCCESS);
+ final List<MockFlowFile> flowFiles = runner.getFlowFilesForRelationship(ExecuteProcess.REL_SUCCESS);
for (final MockFlowFile flowFile : flowFiles) {
System.out.println(flowFile);
System.out.println(new String(flowFile.toByteArray()));
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java
index f95d644..4e4a6b0 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.ExecuteStreamCommand;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -48,10 +47,8 @@ public class TestExecuteStreamCommand {
public static void init() {
System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
System.setProperty("org.slf4j.simpleLogger.showDateTime", "true");
- System.
- setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.ExecuteStreamCommand", "debug");
- System.
- setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.TestExecuteStreamCommand", "debug");
+ System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.ExecuteStreamCommand", "debug");
+ System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.TestExecuteStreamCommand", "debug");
LOGGER = LoggerFactory.getLogger(TestExecuteStreamCommand.class);
}
@@ -61,46 +58,31 @@ public class TestExecuteStreamCommand {
File dummy = new File("src/test/resources/ExecuteCommand/1000bytes.txt");
String jarPath = exJar.getAbsolutePath();
exJar.setExecutable(true);
- final TestRunner controller = TestRunners.
- newTestRunner(ExecuteStreamCommand.class);
+ final TestRunner controller = TestRunners.newTestRunner(ExecuteStreamCommand.class);
controller.setValidateExpressionUsage(false);
controller.enqueue(dummy.toPath());
controller.setProperty(ExecuteStreamCommand.EXECUTION_COMMAND, "java");
- controller.
- setProperty(ExecuteStreamCommand.EXECUTION_ARGUMENTS, "-jar;" + jarPath);
+ controller.setProperty(ExecuteStreamCommand.EXECUTION_ARGUMENTS, "-jar;" + jarPath);
controller.run(1);
- controller.
- assertTransferCount(ExecuteStreamCommand.ORIGINAL_RELATIONSHIP, 1);
- controller.
- assertTransferCount(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP, 1);
+ controller.assertTransferCount(ExecuteStreamCommand.ORIGINAL_RELATIONSHIP, 1);
+ controller.assertTransferCount(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP, 1);
- List<MockFlowFile> flowFiles = controller.
- getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
+ List<MockFlowFile> flowFiles = controller.getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
MockFlowFile outputFlowFile = flowFiles.get(0);
byte[] byteArray = outputFlowFile.toByteArray();
String result = new String(byteArray);
- assertTrue("Test was a success\r\n".equals(result) || "Test was a success\n".
- equals(result));
+ assertTrue("Test was a success\r\n".equals(result) || "Test was a success\n".equals(result));
assertEquals("0", outputFlowFile.getAttribute("execution.status"));
assertEquals("java", outputFlowFile.getAttribute("execution.command"));
- assertEquals("-jar;", outputFlowFile.
- getAttribute("execution.command.args").
- substring(0, 5));
+ assertEquals("-jar;", outputFlowFile.getAttribute("execution.command.args").substring(0, 5));
String attribute = outputFlowFile.getAttribute("execution.command.args");
- String expected = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "ExecuteCommand" + File.separator
- + "TestSuccess.jar";
- assertEquals(expected, attribute.
- substring(attribute.length() - expected.length()));
-
- MockFlowFile originalFlowFile = controller.
- getFlowFilesForRelationship(ExecuteStreamCommand.ORIGINAL_RELATIONSHIP).
- get(0);
- assertEquals(outputFlowFile.getAttribute("execution.status"), originalFlowFile.
- getAttribute("execution.status"));
- assertEquals(outputFlowFile.getAttribute("execution.command"), originalFlowFile.
- getAttribute("execution.command"));
- assertEquals(outputFlowFile.getAttribute("execution.command.args"), originalFlowFile.
- getAttribute("execution.command.args"));
+ String expected = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "ExecuteCommand" + File.separator + "TestSuccess.jar";
+ assertEquals(expected, attribute.substring(attribute.length() - expected.length()));
+
+ MockFlowFile originalFlowFile = controller.getFlowFilesForRelationship(ExecuteStreamCommand.ORIGINAL_RELATIONSHIP).get(0);
+ assertEquals(outputFlowFile.getAttribute("execution.status"), originalFlowFile.getAttribute("execution.status"));
+ assertEquals(outputFlowFile.getAttribute("execution.command"), originalFlowFile.getAttribute("execution.command"));
+ assertEquals(outputFlowFile.getAttribute("execution.command.args"), originalFlowFile.getAttribute("execution.command.args"));
}
@Test
@@ -109,25 +91,17 @@ public class TestExecuteStreamCommand {
File dummy = new File("src/test/resources/ExecuteCommand/1000bytes.txt");
String jarPath = exJar.getAbsolutePath();
exJar.setExecutable(true);
- final TestRunner controller = TestRunners.
- newTestRunner(ExecuteStreamCommand.class);
+ final TestRunner controller = TestRunners.newTestRunner(ExecuteStreamCommand.class);
controller.setValidateExpressionUsage(false);
controller.enqueue(dummy.toPath());
controller.setProperty(ExecuteStreamCommand.EXECUTION_COMMAND, "java");
- controller.
- setProperty(ExecuteStreamCommand.EXECUTION_ARGUMENTS, "-jar;" + jarPath);
+ controller.setProperty(ExecuteStreamCommand.EXECUTION_ARGUMENTS, "-jar;" + jarPath);
controller.run(1);
- controller.
- assertTransferCount(ExecuteStreamCommand.ORIGINAL_RELATIONSHIP, 1);
- controller.
- assertTransferCount(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP, 1);
- List<MockFlowFile> flowFiles = controller.
- getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
- assertEquals(0, flowFiles.get(0).
- getSize());
- assertEquals("Error: Unable to access jarfile", flowFiles.get(0).
- getAttribute("execution.error").
- substring(0, 31));
+ controller.assertTransferCount(ExecuteStreamCommand.ORIGINAL_RELATIONSHIP, 1);
+ controller.assertTransferCount(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP, 1);
+ List<MockFlowFile> flowFiles = controller.getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
+ assertEquals(0, flowFiles.get(0).getSize());
+ assertEquals("Error: Unable to access jarfile", flowFiles.get(0).getAttribute("execution.error").substring(0, 31));
}
@Test
@@ -146,28 +120,20 @@ public class TestExecuteStreamCommand {
fos.close();
String jarPath = exJar.getAbsolutePath();
exJar.setExecutable(true);
- final TestRunner controller = TestRunners.
- newTestRunner(ExecuteStreamCommand.class);
+ final TestRunner controller = TestRunners.newTestRunner(ExecuteStreamCommand.class);
controller.setValidateExpressionUsage(false);
controller.enqueue(dummy100MBytes.toPath());
controller.setProperty(ExecuteStreamCommand.EXECUTION_COMMAND, "java");
- controller.
- setProperty(ExecuteStreamCommand.EXECUTION_ARGUMENTS, "-jar;" + jarPath);
+ controller.setProperty(ExecuteStreamCommand.EXECUTION_ARGUMENTS, "-jar;" + jarPath);
controller.run(1);
- controller.
- assertTransferCount(ExecuteStreamCommand.ORIGINAL_RELATIONSHIP, 1);
- controller.
- assertTransferCount(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP, 1);
- List<MockFlowFile> flowFiles = controller.
- getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
- byte[] byteArray = flowFiles.get(0).
- toByteArray();
+ controller.assertTransferCount(ExecuteStreamCommand.ORIGINAL_RELATIONSHIP, 1);
+ controller.assertTransferCount(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP, 1);
+ List<MockFlowFile> flowFiles = controller.getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
+ byte[] byteArray = flowFiles.get(0).toByteArray();
String result = new String(byteArray);
- assertTrue(result.
- contains(File.separator + "nifi-standard-processors:ModifiedResult\r\n")
- || result.
- contains(File.separator + "nifi-standard-processors:ModifiedResult\n"));
+ assertTrue(result.contains(File.separator + "nifi-standard-processors:ModifiedResult\r\n")
+ || result.contains(File.separator + "nifi-standard-processors:ModifiedResult\n"));
}
@Test
@@ -176,28 +142,20 @@ public class TestExecuteStreamCommand {
File dummy = new File("src/test/resources/ExecuteCommand/1000bytes.txt");
String jarPath = exJar.getAbsolutePath();
exJar.setExecutable(true);
- final TestRunner controller = TestRunners.
- newTestRunner(ExecuteStreamCommand.class);
+ final TestRunner controller = TestRunners.newTestRunner(ExecuteStreamCommand.class);
controller.setValidateExpressionUsage(false);
controller.enqueue(dummy.toPath());
controller.setProperty(ExecuteStreamCommand.WORKING_DIR, "target");
controller.setProperty(ExecuteStreamCommand.EXECUTION_COMMAND, "java");
- controller.
- setProperty(ExecuteStreamCommand.EXECUTION_ARGUMENTS, "-jar;" + jarPath);
+ controller.setProperty(ExecuteStreamCommand.EXECUTION_ARGUMENTS, "-jar;" + jarPath);
controller.run(1);
- controller.
- assertTransferCount(ExecuteStreamCommand.ORIGINAL_RELATIONSHIP, 1);
- controller.
- assertTransferCount(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP, 1);
- List<MockFlowFile> flowFiles = controller.
- getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
- byte[] byteArray = flowFiles.get(0).
- toByteArray();
+ controller.assertTransferCount(ExecuteStreamCommand.ORIGINAL_RELATIONSHIP, 1);
+ controller.assertTransferCount(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP, 1);
+ List<MockFlowFile> flowFiles = controller.getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
+ byte[] byteArray = flowFiles.get(0).toByteArray();
String result = new String(byteArray);
- assertTrue(result.
- contains(File.separator + "nifi-standard-processors" + File.separator + "target:ModifiedResult\r\n")
- || result.
- contains(File.separator + "nifi-standard-processors" + File.separator + "target:ModifiedResult\n"));
+ assertTrue(result.contains(File.separator + "nifi-standard-processors" + File.separator + "target:ModifiedResult\r\n")
+ || result.contains(File.separator + "nifi-standard-processors" + File.separator + "target:ModifiedResult\n"));
}
// this is dependent on window with cygwin...so it's not enabled
@@ -207,8 +165,7 @@ public class TestExecuteStreamCommand {
File testFile = new File("target/test.txt");
testFile.delete();
File dummy = new File("src/test/resources/ExecuteCommand/1000bytes.txt");
- final TestRunner controller = TestRunners.
- newTestRunner(ExecuteStreamCommand.class);
+ final TestRunner controller = TestRunners.newTestRunner(ExecuteStreamCommand.class);
controller.setValidateExpressionUsage(false);
controller.enqueue(dummy.toPath());
controller.enqueue(dummy.toPath());
@@ -217,17 +174,13 @@ public class TestExecuteStreamCommand {
controller.enqueue(dummy.toPath());
controller.setProperty(ExecuteStreamCommand.WORKING_DIR, "target/xx1");
controller.setThreadCount(6);
- controller.
- setProperty(ExecuteStreamCommand.EXECUTION_COMMAND, "c:\\cygwin\\bin\\touch");
- controller.
- setProperty(ExecuteStreamCommand.EXECUTION_ARGUMENTS, "test.txt");
+ controller.setProperty(ExecuteStreamCommand.EXECUTION_COMMAND, "c:\\cygwin\\bin\\touch");
+ controller.setProperty(ExecuteStreamCommand.EXECUTION_ARGUMENTS, "test.txt");
controller.assertValid();
controller.run(6);
- List<MockFlowFile> flowFiles = controller.
- getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
+ List<MockFlowFile> flowFiles = controller.getFlowFilesForRelationship(ExecuteStreamCommand.OUTPUT_STREAM_RELATIONSHIP);
assertEquals(5, flowFiles.size());
- assertEquals(0, flowFiles.get(0).
- getSize());
+ assertEquals(0, flowFiles.get(0).getSize());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExtractText.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExtractText.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExtractText.java
index 045a4f9..fd47cf7 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExtractText.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExtractText.java
@@ -37,14 +37,12 @@ public class TestExtractText {
@Test
public void testProcessor() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new ExtractText());
+ final TestRunner testRunner = TestRunners.newTestRunner(new ExtractText());
testRunner.setProperty("regex.result1", "(?s)(.*)");
testRunner.setProperty("regex.result2", "(?s).*(bar1).*");
testRunner.setProperty("regex.result3", "(?s).*?(bar\\d).*"); // reluctant gets first
- testRunner.
- setProperty("regex.result4", "(?s).*?(?:bar\\d).*?(bar\\d).*?(bar3).*"); // reluctant w/ repeated pattern gets second
+ testRunner.setProperty("regex.result4", "(?s).*?(?:bar\\d).*?(bar\\d).*?(bar3).*"); // reluctant w/ repeated pattern gets second
testRunner.setProperty("regex.result5", "(?s).*(bar\\d).*"); // greedy gets last
testRunner.setProperty("regex.result6", "(?s)^(.*)$");
testRunner.setProperty("regex.result7", "(?s)(XXX)");
@@ -53,9 +51,7 @@ public class TestExtractText {
testRunner.run();
testRunner.assertAllFlowFilesTransferred(ExtractText.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(ExtractText.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(ExtractText.REL_MATCH).get(0);
out.assertAttributeEquals("regex.result1", SAMPLE_STRING);
out.assertAttributeEquals("regex.result2", "bar1");
out.assertAttributeEquals("regex.result3", "bar1");
@@ -72,8 +68,7 @@ public class TestExtractText {
@Test
public void testProcessorWithDotall() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new ExtractText());
+ final TestRunner testRunner = TestRunners.newTestRunner(new ExtractText());
testRunner.setProperty(ExtractText.DOTALL, "true");
@@ -89,9 +84,7 @@ public class TestExtractText {
testRunner.run();
testRunner.assertAllFlowFilesTransferred(ExtractText.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(ExtractText.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(ExtractText.REL_MATCH).get(0);
out.assertAttributeEquals("regex.result1", SAMPLE_STRING);
out.assertAttributeEquals("regex.result2", "bar1");
out.assertAttributeEquals("regex.result3", "bar1");
@@ -105,8 +98,7 @@ public class TestExtractText {
@Test
public void testProcessorWithMultiline() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new ExtractText());
+ final TestRunner testRunner = TestRunners.newTestRunner(new ExtractText());
testRunner.setProperty(ExtractText.MULTILINE, "true");
@@ -124,9 +116,7 @@ public class TestExtractText {
testRunner.run();
testRunner.assertAllFlowFilesTransferred(ExtractText.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(ExtractText.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(ExtractText.REL_MATCH).get(0);
out.assertAttributeEquals("regex.result1", "foo"); // matches everything on the first line
out.assertAttributeEquals("regex.result2", "bar1");
out.assertAttributeEquals("regex.result3", "bar1");
@@ -141,8 +131,7 @@ public class TestExtractText {
@Test
public void testProcessorWithMultilineAndDotall() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new ExtractText());
+ final TestRunner testRunner = TestRunners.newTestRunner(new ExtractText());
testRunner.setProperty(ExtractText.MULTILINE, "true");
testRunner.setProperty(ExtractText.DOTALL, "true");
@@ -161,9 +150,7 @@ public class TestExtractText {
testRunner.run();
testRunner.assertAllFlowFilesTransferred(ExtractText.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(ExtractText.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(ExtractText.REL_MATCH).get(0);
out.assertAttributeEquals("regex.result1", SAMPLE_STRING);
out.assertAttributeEquals("regex.result2", "bar1");
@@ -179,8 +166,7 @@ public class TestExtractText {
@Test
public void testProcessorWithNoMatches() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new ExtractText());
+ final TestRunner testRunner = TestRunners.newTestRunner(new ExtractText());
testRunner.setProperty(ExtractText.MULTILINE, "true");
testRunner.setProperty(ExtractText.DOTALL, "true");
@@ -197,9 +183,7 @@ public class TestExtractText {
testRunner.run();
testRunner.assertAllFlowFilesTransferred(ExtractText.REL_NO_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(ExtractText.REL_NO_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(ExtractText.REL_NO_MATCH).get(0);
out.assertAttributeEquals("regex.result1", null);
out.assertAttributeEquals("regex.result2", null);
@@ -214,8 +198,7 @@ public class TestExtractText {
@Test(expected = java.lang.AssertionError.class)
public void testNoCaptureGroups() throws UnsupportedEncodingException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new ExtractText());
+ final TestRunner testRunner = TestRunners.newTestRunner(new ExtractText());
testRunner.setProperty("regex.result1", ".*");
testRunner.enqueue(SAMPLE_STRING.getBytes("UTF-8"));
testRunner.run();
@@ -223,8 +206,7 @@ public class TestExtractText {
@Test
public void testNoFlowFile() throws UnsupportedEncodingException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new ExtractText());
+ final TestRunner testRunner = TestRunners.newTestRunner(new ExtractText());
testRunner.run();
testRunner.assertAllFlowFilesTransferred(ExtractText.REL_MATCH, 0);
@@ -232,8 +214,7 @@ public class TestExtractText {
@Test
public void testMatchOutsideBuffer() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new ExtractText());
+ final TestRunner testRunner = TestRunners.newTestRunner(new ExtractText());
testRunner.setProperty(ExtractText.MAX_BUFFER_SIZE, "3 B");//only read the first 3 chars ("foo")
@@ -244,9 +225,7 @@ public class TestExtractText {
testRunner.run();
testRunner.assertAllFlowFilesTransferred(ExtractText.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(ExtractText.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(ExtractText.REL_MATCH).get(0);
out.assertAttributeEquals("regex.result1", "foo");
out.assertAttributeEquals("regex.result2", null); // null because outsk
@@ -267,63 +246,53 @@ public class TestExtractText {
// UNIX_LINES
testRunner = TestRunners.newTestRunner(processor);
testRunner.setProperty(ExtractText.UNIX_LINES, "true");
- assertEquals(Pattern.UNIX_LINES, processor.getCompileFlags(testRunner.
- getProcessContext()));
+ assertEquals(Pattern.UNIX_LINES, processor.getCompileFlags(testRunner.getProcessContext()));
// CASE_INSENSITIVE
testRunner = TestRunners.newTestRunner(processor);
testRunner.setProperty(ExtractText.CASE_INSENSITIVE, "true");
- assertEquals(Pattern.CASE_INSENSITIVE, processor.
- getCompileFlags(testRunner.getProcessContext()));
+ assertEquals(Pattern.CASE_INSENSITIVE, processor.getCompileFlags(testRunner.getProcessContext()));
// COMMENTS
testRunner = TestRunners.newTestRunner(processor);
testRunner.setProperty(ExtractText.COMMENTS, "true");
- assertEquals(Pattern.COMMENTS, processor.getCompileFlags(testRunner.
- getProcessContext()));
+ assertEquals(Pattern.COMMENTS, processor.getCompileFlags(testRunner.getProcessContext()));
// MULTILINE
testRunner = TestRunners.newTestRunner(processor);
testRunner.setProperty(ExtractText.MULTILINE, "true");
- assertEquals(Pattern.MULTILINE, processor.getCompileFlags(testRunner.
- getProcessContext()));
+ assertEquals(Pattern.MULTILINE, processor.getCompileFlags(testRunner.getProcessContext()));
// LITERAL
testRunner = TestRunners.newTestRunner(processor);
testRunner.setProperty(ExtractText.LITERAL, "true");
- assertEquals(Pattern.LITERAL, processor.getCompileFlags(testRunner.
- getProcessContext()));
+ assertEquals(Pattern.LITERAL, processor.getCompileFlags(testRunner.getProcessContext()));
// DOTALL
testRunner = TestRunners.newTestRunner(processor);
testRunner.setProperty(ExtractText.DOTALL, "true");
- assertEquals(Pattern.DOTALL, processor.getCompileFlags(testRunner.
- getProcessContext()));
+ assertEquals(Pattern.DOTALL, processor.getCompileFlags(testRunner.getProcessContext()));
// UNICODE_CASE
testRunner = TestRunners.newTestRunner(processor);
testRunner.setProperty(ExtractText.UNICODE_CASE, "true");
- assertEquals(Pattern.UNICODE_CASE, processor.getCompileFlags(testRunner.
- getProcessContext()));
+ assertEquals(Pattern.UNICODE_CASE, processor.getCompileFlags(testRunner.getProcessContext()));
// CANON_EQ
testRunner = TestRunners.newTestRunner(processor);
testRunner.setProperty(ExtractText.CANON_EQ, "true");
- assertEquals(Pattern.CANON_EQ, processor.getCompileFlags(testRunner.
- getProcessContext()));
+ assertEquals(Pattern.CANON_EQ, processor.getCompileFlags(testRunner.getProcessContext()));
// UNICODE_CHARACTER_CLASS
testRunner = TestRunners.newTestRunner(processor);
testRunner.setProperty(ExtractText.UNICODE_CHARACTER_CLASS, "true");
- assertEquals(Pattern.UNICODE_CHARACTER_CLASS, processor.
- getCompileFlags(testRunner.getProcessContext()));
+ assertEquals(Pattern.UNICODE_CHARACTER_CLASS, processor.getCompileFlags(testRunner.getProcessContext()));
// DOTALL and MULTILINE
testRunner = TestRunners.newTestRunner(processor);
testRunner.setProperty(ExtractText.DOTALL, "true");
testRunner.setProperty(ExtractText.MULTILINE, "true");
- assertEquals(Pattern.DOTALL | Pattern.MULTILINE, processor.
- getCompileFlags(testRunner.getProcessContext()));
+ assertEquals(Pattern.DOTALL | Pattern.MULTILINE, processor.getCompileFlags(testRunner.getProcessContext()));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
index f0526d9..018cbdc 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetFile.java
@@ -46,8 +46,7 @@ public class TestGetFile {
public void testFilePickedUp() throws IOException {
final File directory = new File("target/test/data/in");
deleteDirectory(directory);
- assertTrue("Unable to create test data directory " + directory.
- getAbsolutePath(), directory.exists() || directory.mkdirs());
+ assertTrue("Unable to create test data directory " + directory.getAbsolutePath(), directory.exists() || directory.mkdirs());
final File inFile = new File("src/test/resources/hello.txt");
final Path inPath = inFile.toPath();
@@ -62,16 +61,12 @@ public class TestGetFile {
runner.run();
runner.assertAllFlowFilesTransferred(GetFile.REL_SUCCESS, 1);
- final List<MockFlowFile> successFiles = runner.
- getFlowFilesForRelationship(GetFile.REL_SUCCESS);
- successFiles.get(0).
- assertContentEquals("Hello, World!".getBytes("UTF-8"));
+ final List<MockFlowFile> successFiles = runner.getFlowFilesForRelationship(GetFile.REL_SUCCESS);
+ successFiles.get(0).assertContentEquals("Hello, World!".getBytes("UTF-8"));
- final String path = successFiles.get(0).
- getAttribute("path");
+ final String path = successFiles.get(0).getAttribute("path");
assertEquals("/", path);
- final String absolutePath = successFiles.get(0).
- getAttribute(CoreAttributes.ABSOLUTE_PATH.key());
+ final String absolutePath = successFiles.get(0).getAttribute(CoreAttributes.ABSOLUTE_PATH.key());
assertEquals(absTargetPathStr, absolutePath);
}
@@ -82,8 +77,7 @@ public class TestGetFile {
deleteDirectory(file);
}
- assertTrue("Could not delete " + file.getAbsolutePath(), file.
- delete());
+ assertTrue("Could not delete " + file.getAbsolutePath(), file.delete());
}
}
}
@@ -95,8 +89,7 @@ public class TestGetFile {
final File directory = new File("target/test/data/in/" + dirStruc);
deleteDirectory(directory);
- assertTrue("Unable to create test data directory " + directory.
- getAbsolutePath(), directory.exists() || directory.mkdirs());
+ assertTrue("Unable to create test data directory " + directory.getAbsolutePath(), directory.exists() || directory.mkdirs());
final File inFile = new File("src/test/resources/hello.txt");
final Path inPath = inFile.toPath();
@@ -105,15 +98,12 @@ public class TestGetFile {
Files.copy(inPath, targetPath);
final TestRunner runner = TestRunners.newTestRunner(new GetFile());
- runner.
- setProperty(GetFile.DIRECTORY, "target/test/data/in/${now():format('yyyy/MM/dd')}");
+ runner.setProperty(GetFile.DIRECTORY, "target/test/data/in/${now():format('yyyy/MM/dd')}");
runner.run();
runner.assertAllFlowFilesTransferred(GetFile.REL_SUCCESS, 1);
- final List<MockFlowFile> successFiles = runner.
- getFlowFilesForRelationship(GetFile.REL_SUCCESS);
- successFiles.get(0).
- assertContentEquals("Hello, World!".getBytes("UTF-8"));
+ final List<MockFlowFile> successFiles = runner.getFlowFilesForRelationship(GetFile.REL_SUCCESS);
+ successFiles.get(0).assertContentEquals("Hello, World!".getBytes("UTF-8"));
}
@Test
@@ -123,16 +113,14 @@ public class TestGetFile {
final File directory = new File("target/test/data/in/" + dirStruc);
deleteDirectory(new File("target/test/data/in"));
- assertTrue("Unable to create test data directory " + directory.
- getAbsolutePath(), directory.exists() || directory.mkdirs());
+ assertTrue("Unable to create test data directory " + directory.getAbsolutePath(), directory.exists() || directory.mkdirs());
final File inFile = new File("src/test/resources/hello.txt");
final Path inPath = inFile.toPath();
final File destFile = new File(directory, inFile.getName());
final Path targetPath = destFile.toPath();
final Path absTargetPath = targetPath.toAbsolutePath();
- final String absTargetPathStr = absTargetPath.getParent().
- toString() + "/";
+ final String absTargetPathStr = absTargetPath.getParent().toString() + "/";
Files.copy(inPath, targetPath);
final TestRunner runner = TestRunners.newTestRunner(new GetFile());
@@ -140,16 +128,12 @@ public class TestGetFile {
runner.run();
runner.assertAllFlowFilesTransferred(GetFile.REL_SUCCESS, 1);
- final List<MockFlowFile> successFiles = runner.
- getFlowFilesForRelationship(GetFile.REL_SUCCESS);
- successFiles.get(0).
- assertContentEquals("Hello, World!".getBytes("UTF-8"));
+ final List<MockFlowFile> successFiles = runner.getFlowFilesForRelationship(GetFile.REL_SUCCESS);
+ successFiles.get(0).assertContentEquals("Hello, World!".getBytes("UTF-8"));
- final String path = successFiles.get(0).
- getAttribute("path");
+ final String path = successFiles.get(0).getAttribute("path");
assertEquals(dirStruc, path.replace('\\', '/'));
- final String absolutePath = successFiles.get(0).
- getAttribute(CoreAttributes.ABSOLUTE_PATH.key());
+ final String absolutePath = successFiles.get(0).getAttribute(CoreAttributes.ABSOLUTE_PATH.key());
assertEquals(absTargetPathStr, absolutePath);
}
@@ -157,8 +141,7 @@ public class TestGetFile {
public void testAttributes() throws IOException {
final File directory = new File("target/test/data/in/");
deleteDirectory(directory);
- assertTrue("Unable to create test data directory " + directory.
- getAbsolutePath(), directory.exists() || directory.mkdirs());
+ assertTrue("Unable to create test data directory " + directory.getAbsolutePath(), directory.exists() || directory.mkdirs());
final File inFile = new File("src/test/resources/hello.txt");
final Path inPath = inFile.toPath();
@@ -175,8 +158,7 @@ public class TestGetFile {
boolean verifyPermissions = false;
try {
- Files.setPosixFilePermissions(targetPath, PosixFilePermissions.
- fromString("r--r-----"));
+ Files.setPosixFilePermissions(targetPath, PosixFilePermissions.fromString("r--r-----"));
verifyPermissions = true;
} catch (Exception donothing) {
}
@@ -186,22 +168,19 @@ public class TestGetFile {
runner.run();
runner.assertAllFlowFilesTransferred(GetFile.REL_SUCCESS, 1);
- final List<MockFlowFile> successFiles = runner.
- getFlowFilesForRelationship(GetFile.REL_SUCCESS);
+ final List<MockFlowFile> successFiles = runner.getFlowFilesForRelationship(GetFile.REL_SUCCESS);
if (verifyLastModified) {
try {
final DateFormat formatter = new SimpleDateFormat(GetFile.FILE_MODIFY_DATE_ATTR_FORMAT, Locale.US);
- final Date fileModifyTime = formatter.parse(successFiles.get(0).
- getAttribute("file.lastModifiedTime"));
+ final Date fileModifyTime = formatter.parse(successFiles.get(0).getAttribute("file.lastModifiedTime"));
assertEquals(new Date(1000000000), fileModifyTime);
} catch (ParseException e) {
fail();
}
}
if (verifyPermissions) {
- successFiles.get(0).
- assertAttributeEquals("file.permissions", "r--r-----");
+ successFiles.get(0).assertAttributeEquals("file.permissions", "r--r-----");
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
index 7a76ffd..bd975f2 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
@@ -53,10 +53,8 @@ public class TestGetHTTP {
public static void before() {
System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
System.setProperty("org.slf4j.simpleLogger.showDateTime", "true");
- System.
- setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.GetHTTP", "debug");
- System.
- setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.TestGetHTTP", "debug");
+ System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.GetHTTP", "debug");
+ System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.TestGetHTTP", "debug");
File confDir = new File("conf");
if (!confDir.exists()) {
confDir.mkdir();
@@ -96,26 +94,21 @@ public class TestGetHTTP {
controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
controller.setProperty(GetHTTP.URL, destination);
controller.setProperty(GetHTTP.FILENAME, "testFile");
- controller.
- setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+ controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
GetHTTP getHTTPProcessor = (GetHTTP) controller.getProcessor();
assertEquals("", getHTTPProcessor.entityTagRef.get());
- assertEquals("Thu, 01 Jan 1970 00:00:00 GMT", getHTTPProcessor.lastModifiedRef.
- get());
+ assertEquals("Thu, 01 Jan 1970 00:00:00 GMT", getHTTPProcessor.lastModifiedRef.get());
controller.run(2);
// verify the lastModified and entityTag are updated
assertFalse("".equals(getHTTPProcessor.entityTagRef.get()));
- assertFalse("Thu, 01 Jan 1970 00:00:00 GMT".
- equals(getHTTPProcessor.lastModifiedRef.get()));
+ assertFalse("Thu, 01 Jan 1970 00:00:00 GMT".equals(getHTTPProcessor.lastModifiedRef.get()));
// ran twice, but got one...which is good
controller.assertTransferCount(GetHTTP.REL_SUCCESS, 1);
// verify remote.source flowfile attribute
- controller.getFlowFilesForRelationship(GetHTTP.REL_SUCCESS).
- get(0).
- assertAttributeEquals("gethttp.remote.source", "localhost");
+ controller.getFlowFilesForRelationship(GetHTTP.REL_SUCCESS).get(0).assertAttributeEquals("gethttp.remote.source", "localhost");
controller.clearTransferState();
@@ -153,8 +146,7 @@ public class TestGetHTTP {
// turn off checking for Etag, turn on checking for lastModified, but change value
RESTServiceContentModified.IGNORE_LAST_MODIFIED = false;
RESTServiceContentModified.IGNORE_ETAG = true;
- RESTServiceContentModified.modificationDate = System.
- currentTimeMillis() / 1000 * 1000 + 5000;
+ RESTServiceContentModified.modificationDate = System.currentTimeMillis() / 1000 * 1000 + 5000;
String lastMod = getHTTPProcessor.lastModifiedRef.get();
controller.run(2);
// ran twice, got 1...but should have new cached etag
@@ -196,14 +188,12 @@ public class TestGetHTTP {
controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
controller.setProperty(GetHTTP.FILENAME, "testFile");
controller.setProperty(GetHTTP.URL, destination);
- controller.
- setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+ controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
GetHTTP getHTTPProcessor = (GetHTTP) controller.getProcessor();
assertEquals("", getHTTPProcessor.entityTagRef.get());
- assertEquals("Thu, 01 Jan 1970 00:00:00 GMT", getHTTPProcessor.lastModifiedRef.
- get());
+ assertEquals("Thu, 01 Jan 1970 00:00:00 GMT", getHTTPProcessor.lastModifiedRef.get());
controller.run(2);
// verify the lastModified and entityTag are updated
@@ -226,9 +216,7 @@ public class TestGetHTTP {
assertEquals(etag, props.getProperty(GetHTTP.ETAG));
assertEquals(lastMod, props.getProperty(GetHTTP.LAST_MODIFIED));
- ProcessorInitializationContext pic = new MockProcessorInitializationContext(controller.
- getProcessor(),
- (MockProcessContext) controller.getProcessContext());
+ ProcessorInitializationContext pic = new MockProcessorInitializationContext(controller.getProcessor(), (MockProcessContext) controller.getProcessContext());
// init causes read from file
getHTTPProcessor.init(pic);
assertEquals(etag, getHTTPProcessor.entityTagRef.get());
@@ -274,8 +262,7 @@ public class TestGetHTTP {
controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
controller.setProperty(GetHTTP.URL, destination);
controller.setProperty(GetHTTP.FILENAME, "testFile");
- controller.
- setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+ controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
controller.run();
controller.assertTransferCount(GetHTTP.REL_SUCCESS, 0);
@@ -292,15 +279,11 @@ public class TestGetHTTP {
private Map<String, String> getSslProperties() {
Map<String, String> props = new HashMap<String, String>();
- props.
- put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- props.
- put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ props.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
+ props.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
props.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
- props.
- put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- props.
- put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ props.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
+ props.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
props.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
return props;
}
@@ -308,8 +291,7 @@ public class TestGetHTTP {
private void useSSLContextService() {
final SSLContextService service = new StandardSSLContextService();
try {
- controller.
- addControllerService("ssl-service", service, getSslProperties());
+ controller.addControllerService("ssl-service", service, getSslProperties());
controller.enableControllerService(service);
} catch (InitializationException ex) {
ex.printStackTrace();
@@ -341,14 +323,11 @@ public class TestGetHTTP {
controller.setProperty(GetHTTP.CONNECTION_TIMEOUT, "5 secs");
controller.setProperty(GetHTTP.URL, destination);
controller.setProperty(GetHTTP.FILENAME, "testFile");
- controller.
- setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
+ controller.setProperty(GetHTTP.ACCEPT_CONTENT_TYPE, "application/json");
controller.run();
controller.assertAllFlowFilesTransferred(GetHTTP.REL_SUCCESS, 1);
- final MockFlowFile mff = controller.
- getFlowFilesForRelationship(GetHTTP.REL_SUCCESS).
- get(0);
+ final MockFlowFile mff = controller.getFlowFilesForRelationship(GetHTTP.REL_SUCCESS).get(0);
mff.assertContentEquals("Hello, World!");
} finally {
server.shutdownServer();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetJMSQueue.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetJMSQueue.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetJMSQueue.java
index b6c79d5..9c833f5 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetJMSQueue.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetJMSQueue.java
@@ -36,16 +36,12 @@ public class TestGetJMSQueue {
@org.junit.Ignore
public void testSendTextToQueue() throws Exception {
final TestRunner runner = TestRunners.newTestRunner(GetJMSQueue.class);
- runner.
- setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
+ runner.setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
runner.setProperty(JmsProperties.URL, "tcp://localhost:61616");
- runner.
- setProperty(JmsProperties.DESTINATION_TYPE, JmsProperties.DESTINATION_TYPE_QUEUE);
+ runner.setProperty(JmsProperties.DESTINATION_TYPE, JmsProperties.DESTINATION_TYPE_QUEUE);
runner.setProperty(JmsProperties.DESTINATION_NAME, "queue.testing");
- runner.
- setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
- WrappedMessageProducer wrappedProducer = JmsFactory.
- createMessageProducer(runner.getProcessContext(), true);
+ runner.setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
+ WrappedMessageProducer wrappedProducer = JmsFactory.createMessageProducer(runner.getProcessContext(), true);
final Session jmsSession = wrappedProducer.getSession();
final MessageProducer producer = wrappedProducer.getProducer();
@@ -60,16 +56,12 @@ public class TestGetJMSQueue {
@org.junit.Ignore
public void testSendBytesToQueue() throws Exception {
final TestRunner runner = TestRunners.newTestRunner(GetJMSQueue.class);
- runner.
- setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
+ runner.setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
runner.setProperty(JmsProperties.URL, "tcp://localhost:61616");
- runner.
- setProperty(JmsProperties.DESTINATION_TYPE, JmsProperties.DESTINATION_TYPE_QUEUE);
+ runner.setProperty(JmsProperties.DESTINATION_TYPE, JmsProperties.DESTINATION_TYPE_QUEUE);
runner.setProperty(JmsProperties.DESTINATION_NAME, "queue.testing");
- runner.
- setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
- WrappedMessageProducer wrappedProducer = JmsFactory.
- createMessageProducer(runner.getProcessContext(), true);
+ runner.setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
+ WrappedMessageProducer wrappedProducer = JmsFactory.createMessageProducer(runner.getProcessContext(), true);
final Session jmsSession = wrappedProducer.getSession();
final MessageProducer producer = wrappedProducer.getProducer();
@@ -85,16 +77,12 @@ public class TestGetJMSQueue {
@org.junit.Ignore
public void testSendStreamToQueue() throws Exception {
final TestRunner runner = TestRunners.newTestRunner(GetJMSQueue.class);
- runner.
- setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
+ runner.setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
runner.setProperty(JmsProperties.URL, "tcp://localhost:61616");
- runner.
- setProperty(JmsProperties.DESTINATION_TYPE, JmsProperties.DESTINATION_TYPE_QUEUE);
+ runner.setProperty(JmsProperties.DESTINATION_TYPE, JmsProperties.DESTINATION_TYPE_QUEUE);
runner.setProperty(JmsProperties.DESTINATION_NAME, "queue.testing");
- runner.
- setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
- WrappedMessageProducer wrappedProducer = JmsFactory.
- createMessageProducer(runner.getProcessContext(), true);
+ runner.setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
+ WrappedMessageProducer wrappedProducer = JmsFactory.createMessageProducer(runner.getProcessContext(), true);
final Session jmsSession = wrappedProducer.getSession();
final MessageProducer producer = wrappedProducer.getProducer();
@@ -110,16 +98,12 @@ public class TestGetJMSQueue {
@org.junit.Ignore
public void testSendMapToQueue() throws Exception {
final TestRunner runner = TestRunners.newTestRunner(GetJMSQueue.class);
- runner.
- setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
+ runner.setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
runner.setProperty(JmsProperties.URL, "tcp://localhost:61616");
- runner.
- setProperty(JmsProperties.DESTINATION_TYPE, JmsProperties.DESTINATION_TYPE_QUEUE);
+ runner.setProperty(JmsProperties.DESTINATION_TYPE, JmsProperties.DESTINATION_TYPE_QUEUE);
runner.setProperty(JmsProperties.DESTINATION_NAME, "queue.testing");
- runner.
- setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
- WrappedMessageProducer wrappedProducer = JmsFactory.
- createMessageProducer(runner.getProcessContext(), true);
+ runner.setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
+ WrappedMessageProducer wrappedProducer = JmsFactory.createMessageProducer(runner.getProcessContext(), true);
final Session jmsSession = wrappedProducer.getSession();
final MessageProducer producer = wrappedProducer.getProducer();
@@ -136,22 +120,17 @@ public class TestGetJMSQueue {
@org.junit.Ignore
public void testSendObjectToQueue() throws Exception {
final TestRunner runner = TestRunners.newTestRunner(GetJMSQueue.class);
- runner.
- setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
+ runner.setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
runner.setProperty(JmsProperties.URL, "tcp://localhost:61616");
- runner.
- setProperty(JmsProperties.DESTINATION_TYPE, JmsProperties.DESTINATION_TYPE_QUEUE);
+ runner.setProperty(JmsProperties.DESTINATION_TYPE, JmsProperties.DESTINATION_TYPE_QUEUE);
runner.setProperty(JmsProperties.DESTINATION_NAME, "queue.testing");
- runner.
- setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
- WrappedMessageProducer wrappedProducer = JmsFactory.
- createMessageProducer(runner.getProcessContext(), true);
+ runner.setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
+ WrappedMessageProducer wrappedProducer = JmsFactory.createMessageProducer(runner.getProcessContext(), true);
final Session jmsSession = wrappedProducer.getSession();
final MessageProducer producer = wrappedProducer.getProducer();
// Revision class is used because test just needs any Serializable class in core NiFi
- final ObjectMessage message = jmsSession.
- createObjectMessage(new Revision(1L, "ID"));
+ final ObjectMessage message = jmsSession.createObjectMessage(new Revision(1L, "ID"));
producer.send(message);
jmsSession.commit();
[09/12] incubator-nifi git commit: NIFI-271
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
index 451ba57..6f228b2 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java
@@ -94,26 +94,26 @@ public class UnpackContent extends AbstractProcessor {
public static final String OCTET_STREAM = "application/octet-stream";
- public static final PropertyDescriptor PACKAGING_FORMAT = new PropertyDescriptor.Builder().
- name("Packaging Format").
- description("The Packaging Format used to create the file").
- required(true).
- allowableValues(AUTO_DETECT_FORMAT, TAR_FORMAT, ZIP_FORMAT, FLOWFILE_STREAM_FORMAT_V3, FLOWFILE_STREAM_FORMAT_V2, FLOWFILE_TAR_FORMAT).
- defaultValue(AUTO_DETECT_FORMAT).
- build();
-
- public static final Relationship REL_SUCCESS = new Relationship.Builder().
- name("success").
- description("Unpacked FlowFiles are sent to this relationship").
- build();
- public static final Relationship REL_ORIGINAL = new Relationship.Builder().
- name("original").
- description("The original FlowFile is sent to this relationship after it has been successfully unpacked").
- build();
- public static final Relationship REL_FAILURE = new Relationship.Builder().
- name("failure").
- description("The original FlowFile is sent to this relationship when it cannot be unpacked for some reason").
- build();
+ public static final PropertyDescriptor PACKAGING_FORMAT = new PropertyDescriptor.Builder()
+ .name("Packaging Format")
+ .description("The Packaging Format used to create the file")
+ .required(true)
+ .allowableValues(AUTO_DETECT_FORMAT, TAR_FORMAT, ZIP_FORMAT, FLOWFILE_STREAM_FORMAT_V3, FLOWFILE_STREAM_FORMAT_V2, FLOWFILE_TAR_FORMAT)
+ .defaultValue(AUTO_DETECT_FORMAT)
+ .build();
+
+ public static final Relationship REL_SUCCESS = new Relationship.Builder()
+ .name("success")
+ .description("Unpacked FlowFiles are sent to this relationship")
+ .build();
+ public static final Relationship REL_ORIGINAL = new Relationship.Builder()
+ .name("original")
+ .description("The original FlowFile is sent to this relationship after it has been successfully unpacked")
+ .build();
+ public static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("The original FlowFile is sent to this relationship when it cannot be unpacked for some reason")
+ .build();
private Set<Relationship> relationships;
private List<PropertyDescriptor> properties;
@@ -149,15 +149,11 @@ public class UnpackContent extends AbstractProcessor {
}
final ProcessorLog logger = getLogger();
- String packagingFormat = context.getProperty(PACKAGING_FORMAT).
- getValue().
- toLowerCase();
+ String packagingFormat = context.getProperty(PACKAGING_FORMAT).getValue().toLowerCase();
if (AUTO_DETECT_FORMAT.equals(packagingFormat)) {
- final String mimeType = flowFile.
- getAttribute(CoreAttributes.MIME_TYPE.key());
+ final String mimeType = flowFile.getAttribute(CoreAttributes.MIME_TYPE.key());
if (mimeType == null) {
- logger.
- error("No mime.type attribute set for {}; routing to failure", new Object[]{flowFile});
+ logger.error("No mime.type attribute set for {}; routing to failure", new Object[]{flowFile});
session.transfer(flowFile, REL_FAILURE);
return;
}
@@ -179,8 +175,7 @@ public class UnpackContent extends AbstractProcessor {
packagingFormat = FLOWFILE_TAR_FORMAT;
break;
default: {
- logger.
- info("Cannot unpack {} because its mime.type attribute is set to '{}', which is not a format that can be unpacked; routing to 'success'", new Object[]{flowFile, mimeType});
+ logger.info("Cannot unpack {} because its mime.type attribute is set to '{}', which is not a format that can be unpacked; routing to 'success'", new Object[]{flowFile, mimeType});
session.transfer(flowFile, REL_SUCCESS);
return;
}
@@ -211,17 +206,14 @@ public class UnpackContent extends AbstractProcessor {
addFragmentAttrs = false;
break;
default:
- throw new AssertionError("Packaging Format was " + context.
- getProperty(PACKAGING_FORMAT).
- getValue());
+ throw new AssertionError("Packaging Format was " + context.getProperty(PACKAGING_FORMAT).getValue());
}
final List<FlowFile> unpacked = new ArrayList<>();
try {
unpacker.unpack(session, flowFile, unpacked);
if (unpacked.isEmpty()) {
- logger.
- error("Unable to unpack {} because it does not appear to have any entries; routing to failure", new Object[]{flowFile});
+ logger.error("Unable to unpack {} because it does not appear to have any entries; routing to failure", new Object[]{flowFile});
session.transfer(flowFile, REL_FAILURE);
return;
}
@@ -231,13 +223,10 @@ public class UnpackContent extends AbstractProcessor {
}
session.transfer(unpacked, REL_SUCCESS);
session.transfer(flowFile, REL_ORIGINAL);
- session.getProvenanceReporter().
- fork(flowFile, unpacked);
- logger.
- info("Unpacked {} into {} and transferred to success", new Object[]{flowFile, unpacked});
+ session.getProvenanceReporter().fork(flowFile, unpacked);
+ logger.info("Unpacked {} into {} and transferred to success", new Object[]{flowFile, unpacked});
} catch (final ProcessException e) {
- logger.
- error("Unable to unpack {} due to {}; routing to failure", new Object[]{flowFile, e});
+ logger.error("Unable to unpack {} due to {}; routing to failure", new Object[]{flowFile, e});
session.transfer(flowFile, REL_FAILURE);
session.remove(unpacked);
}
@@ -252,8 +241,7 @@ public class UnpackContent extends AbstractProcessor {
@Override
public void unpack(final ProcessSession session, final FlowFile source, final List<FlowFile> unpacked) {
- final String fragmentId = UUID.randomUUID().
- toString();
+ final String fragmentId = UUID.randomUUID().toString();
session.read(source, new InputStreamCallback() {
@Override
public void process(final InputStream in) throws IOException {
@@ -268,38 +256,28 @@ public class UnpackContent extends AbstractProcessor {
final Path filePath = file.toPath();
final String filePathString = filePath.getParent() + "/";
final Path absPath = filePath.toAbsolutePath();
- final String absPathString = absPath.getParent().
- toString() + "/";
+ final String absPathString = absPath.getParent().toString() + "/";
FlowFile unpackedFile = session.create(source);
try {
final Map<String, String> attributes = new HashMap<>();
- attributes.
- put(CoreAttributes.FILENAME.key(), file.
- getName());
- attributes.
- put(CoreAttributes.PATH.key(), filePathString);
- attributes.put(CoreAttributes.ABSOLUTE_PATH.
- key(), absPathString);
- attributes.
- put(CoreAttributes.MIME_TYPE.key(), OCTET_STREAM);
+ attributes.put(CoreAttributes.FILENAME.key(), file.getName());
+ attributes.put(CoreAttributes.PATH.key(), filePathString);
+ attributes.put(CoreAttributes.ABSOLUTE_PATH.key(), absPathString);
+ attributes.put(CoreAttributes.MIME_TYPE.key(), OCTET_STREAM);
attributes.put(FRAGMENT_ID, fragmentId);
- attributes.put(FRAGMENT_INDEX, String.
- valueOf(++fragmentCount));
+ attributes.put(FRAGMENT_INDEX, String.valueOf(++fragmentCount));
- unpackedFile = session.
- putAllAttributes(unpackedFile, attributes);
+ unpackedFile = session.putAllAttributes(unpackedFile, attributes);
final long fileSize = tarEntry.getSize();
- unpackedFile = session.
- write(unpackedFile, new OutputStreamCallback() {
- @Override
- public void process(final OutputStream out) throws IOException {
- StreamUtils.
- copy(tarIn, out, fileSize);
- }
- });
+ unpackedFile = session.write(unpackedFile, new OutputStreamCallback() {
+ @Override
+ public void process(final OutputStream out) throws IOException {
+ StreamUtils.copy(tarIn, out, fileSize);
+ }
+ });
} finally {
unpacked.add(unpackedFile);
}
@@ -314,8 +292,7 @@ public class UnpackContent extends AbstractProcessor {
@Override
public void unpack(final ProcessSession session, final FlowFile source, final List<FlowFile> unpacked) {
- final String fragmentId = UUID.randomUUID().
- toString();
+ final String fragmentId = UUID.randomUUID().toString();
session.read(source, new InputStreamCallback() {
@Override
public void process(final InputStream in) throws IOException {
@@ -327,39 +304,28 @@ public class UnpackContent extends AbstractProcessor {
continue;
}
final File file = new File(zipEntry.getName());
- final String parentDirectory = (file.getParent() == null) ? "/" : file.
- getParent();
- final Path absPath = file.toPath().
- toAbsolutePath();
- final String absPathString = absPath.getParent().
- toString() + "/";
+ final String parentDirectory = (file.getParent() == null) ? "/" : file.getParent();
+ final Path absPath = file.toPath().toAbsolutePath();
+ final String absPathString = absPath.getParent().toString() + "/";
FlowFile unpackedFile = session.create(source);
try {
final Map<String, String> attributes = new HashMap<>();
- attributes.
- put(CoreAttributes.FILENAME.key(), file.
- getName());
- attributes.
- put(CoreAttributes.PATH.key(), parentDirectory);
- attributes.put(CoreAttributes.ABSOLUTE_PATH.
- key(), absPathString);
- attributes.
- put(CoreAttributes.MIME_TYPE.key(), OCTET_STREAM);
+ attributes.put(CoreAttributes.FILENAME.key(), file.getName());
+ attributes.put(CoreAttributes.PATH.key(), parentDirectory);
+ attributes.put(CoreAttributes.ABSOLUTE_PATH.key(), absPathString);
+ attributes.put(CoreAttributes.MIME_TYPE.key(), OCTET_STREAM);
attributes.put(FRAGMENT_ID, fragmentId);
- attributes.put(FRAGMENT_INDEX, String.
- valueOf(++fragmentCount));
-
- unpackedFile = session.
- putAllAttributes(unpackedFile, attributes);
- unpackedFile = session.
- write(unpackedFile, new OutputStreamCallback() {
- @Override
- public void process(final OutputStream out) throws IOException {
- StreamUtils.copy(zipIn, out);
- }
- });
+ attributes.put(FRAGMENT_INDEX, String.valueOf(++fragmentCount));
+
+ unpackedFile = session.putAllAttributes(unpackedFile, attributes);
+ unpackedFile = session.write(unpackedFile, new OutputStreamCallback() {
+ @Override
+ public void process(final OutputStream out) throws IOException {
+ StreamUtils.copy(zipIn, out);
+ }
+ });
} finally {
unpacked.add(unpackedFile);
}
@@ -388,24 +354,20 @@ public class UnpackContent extends AbstractProcessor {
final ObjectHolder<Map<String, String>> attributesRef = new ObjectHolder<>(null);
FlowFile unpackedFile = session.create(source);
try {
- unpackedFile = session.
- write(unpackedFile, new OutputStreamCallback() {
- @Override
- public void process(final OutputStream rawOut) throws IOException {
- try (final OutputStream out = new BufferedOutputStream(rawOut)) {
- final Map<String, String> attributes = unpackager.
- unpackageFlowFile(in, out);
- if (attributes == null) {
- throw new IOException("Failed to unpack " + source + ": stream had no Attributes");
- }
- attributesRef.
- set(attributes);
- }
+ unpackedFile = session.write(unpackedFile, new OutputStreamCallback() {
+ @Override
+ public void process(final OutputStream rawOut) throws IOException {
+ try (final OutputStream out = new BufferedOutputStream(rawOut)) {
+ final Map<String, String> attributes = unpackager.unpackageFlowFile(in, out);
+ if (attributes == null) {
+ throw new IOException("Failed to unpack " + source + ": stream had no Attributes");
}
- });
+ attributesRef.set(attributes);
+ }
+ }
+ });
- final Map<String, String> attributes = attributesRef.
- get();
+ final Map<String, String> attributes = attributesRef.get();
// Remove the UUID from the attributes because we don't want to use the same UUID for this FlowFile.
// If we do, then we get into a weird situation if we use MergeContent to create a FlowFile Package
@@ -413,24 +375,17 @@ public class UnpackContent extends AbstractProcessor {
attributes.remove(CoreAttributes.UUID.key());
// maintain backward compatibility with legacy NiFi attribute names
- mapAttributes(attributes, "nf.file.name", CoreAttributes.FILENAME.
- key());
- mapAttributes(attributes, "nf.file.path", CoreAttributes.PATH.
- key());
- mapAttributes(attributes, "content-encoding", CoreAttributes.MIME_TYPE.
- key());
- mapAttributes(attributes, "content-type", CoreAttributes.MIME_TYPE.
- key());
+ mapAttributes(attributes, "nf.file.name", CoreAttributes.FILENAME.key());
+ mapAttributes(attributes, "nf.file.path", CoreAttributes.PATH.key());
+ mapAttributes(attributes, "content-encoding", CoreAttributes.MIME_TYPE.key());
+ mapAttributes(attributes, "content-type", CoreAttributes.MIME_TYPE.key());
if (!attributes.
- containsKey(CoreAttributes.MIME_TYPE.
- key())) {
- attributes.put(CoreAttributes.MIME_TYPE.
- key(), OCTET_STREAM);
+ containsKey(CoreAttributes.MIME_TYPE.key())) {
+ attributes.put(CoreAttributes.MIME_TYPE.key(), OCTET_STREAM);
}
- unpackedFile = session.
- putAllAttributes(unpackedFile, attributes);
+ unpackedFile = session.putAllAttributes(unpackedFile, attributes);
} finally {
unpacked.add(unpackedFile);
}
@@ -455,8 +410,7 @@ public class UnpackContent extends AbstractProcessor {
}
/**
- * If the unpacked flowfiles contain fragment index attributes, then we need
- * to apply fragment count and other attributes for completeness.
+ * If the unpacked flowfiles contain fragment index attributes, then we need to apply fragment count and other attributes for completeness.
*
* @param session
* @param source
@@ -474,12 +428,9 @@ public class UnpackContent extends AbstractProcessor {
}
}
- String originalFilename = source.getAttribute(CoreAttributes.FILENAME.
- key());
- if (originalFilename.endsWith(".tar") || originalFilename.
- endsWith(".zip") || originalFilename.endsWith(".pkg")) {
- originalFilename = originalFilename.substring(0, originalFilename.
- length() - 4);
+ String originalFilename = source.getAttribute(CoreAttributes.FILENAME.key());
+ if (originalFilename.endsWith(".tar") || originalFilename.endsWith(".zip") || originalFilename.endsWith(".pkg")) {
+ originalFilename = originalFilename.substring(0, originalFilename.length() - 4);
}
// second pass adds fragment attributes
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java
index 40c7e65..ab12be2 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ContentAcknowledgmentServlet.java
@@ -59,33 +59,24 @@ public class ContentAcknowledgmentServlet extends HttpServlet {
@Override
public void init(final ServletConfig config) throws ServletException {
final ServletContext context = config.getServletContext();
- this.processor = (Processor) context.
- getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_PROCESSOR);
- this.logger = (ProcessorLog) context.
- getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_LOGGER);
- this.authorizedPattern = (Pattern) context.
- getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_AUTHORITY_PATTERN);
- this.flowFileMap = (ConcurrentMap<String, FlowFileEntryTimeWrapper>) context.
- getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_FLOWFILE_MAP);
+ this.processor = (Processor) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_PROCESSOR);
+ this.logger = (ProcessorLog) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_LOGGER);
+ this.authorizedPattern = (Pattern) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_AUTHORITY_PATTERN);
+ this.flowFileMap = (ConcurrentMap<String, FlowFileEntryTimeWrapper>) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_FLOWFILE_MAP);
}
@Override
protected void doDelete(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
- final X509Certificate[] certs = (X509Certificate[]) request.
- getAttribute("javax.servlet.request.X509Certificate");
+ final X509Certificate[] certs = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate");
String foundSubject = DEFAULT_FOUND_SUBJECT;
if (certs != null && certs.length > 0) {
for (final X509Certificate cert : certs) {
- foundSubject = cert.getSubjectDN().
- getName();
- if (authorizedPattern.matcher(foundSubject).
- matches()) {
+ foundSubject = cert.getSubjectDN().getName();
+ if (authorizedPattern.matcher(foundSubject).matches()) {
break;
} else {
- logger.
- warn(processor + " rejecting transfer attempt from " + foundSubject + " because the DN is not authorized");
- response.
- sendError(HttpServletResponse.SC_FORBIDDEN, "not allowed based on dn");
+ logger.warn(processor + " rejecting transfer attempt from " + foundSubject + " because the DN is not authorized");
+ response.sendError(HttpServletResponse.SC_FORBIDDEN, "not allowed based on dn");
return;
}
}
@@ -101,10 +92,8 @@ public class ContentAcknowledgmentServlet extends HttpServlet {
final String uuid = uri.substring(slashIndex + 1, questionIndex);
final FlowFileEntryTimeWrapper timeWrapper = flowFileMap.remove(uuid);
if (timeWrapper == null) {
- logger.
- warn("received DELETE for HOLD with ID " + uuid + " from Remote Host: [" + request.
- getRemoteHost() + "] Port [" + request.
- getRemotePort() + "] SubjectDN [" + foundSubject + "], but no HOLD exists with that ID; sending response with Status Code 404");
+ logger.warn("received DELETE for HOLD with ID " + uuid + " from Remote Host: [" + request.getRemoteHost()
+ + "] Port [" + request.getRemotePort() + "] SubjectDN [" + foundSubject + "], but no HOLD exists with that ID; sending response with Status Code 404");
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
}
@@ -112,8 +101,7 @@ public class ContentAcknowledgmentServlet extends HttpServlet {
try {
final Set<FlowFile> flowFiles = timeWrapper.getFlowFiles();
- final long transferTime = System.currentTimeMillis() - timeWrapper.
- getEntryTime();
+ final long transferTime = System.currentTimeMillis() - timeWrapper.getEntryTime();
long totalFlowFileSize = 0;
for (final FlowFile flowFile : flowFiles) {
totalFlowFileSize += flowFile.getSize();
@@ -124,13 +112,11 @@ public class ContentAcknowledgmentServlet extends HttpServlet {
seconds = .00000001D;
}
final double bytesPerSecond = ((double) totalFlowFileSize / seconds);
- final String transferRate = FormatUtils.
- formatDataSize(bytesPerSecond) + "/sec";
+ final String transferRate = FormatUtils.formatDataSize(bytesPerSecond) + "/sec";
- logger.
- info("received {} files/{} bytes from Remote Host: [{}] Port [{}] SubjectDN [{}] in {} milliseconds at a rate of {}; transferring to 'success': {}",
- new Object[]{flowFiles.size(), totalFlowFileSize, request.
- getRemoteHost(), request.getRemotePort(), foundSubject, transferTime, transferRate, flowFiles});
+ logger.info("received {} files/{} bytes from Remote Host: [{}] Port [{}] SubjectDN [{}] in {} milliseconds at a rate of {}; "
+ + "transferring to 'success': {}",
+ new Object[]{flowFiles.size(), totalFlowFileSize, request.getRemoteHost(), request.getRemotePort(), foundSubject, transferTime, transferRate, flowFiles});
final ProcessSession session = timeWrapper.getSession();
session.transfer(flowFiles, ListenHTTP.RELATIONSHIP_SUCCESS);
@@ -139,12 +125,9 @@ public class ContentAcknowledgmentServlet extends HttpServlet {
response.setStatus(HttpServletResponse.SC_OK);
response.flushBuffer();
} catch (final Throwable t) {
- timeWrapper.getSession().
- rollback();
- logger.
- error("received DELETE for HOLD with ID {} from Remote Host: [{}] Port [{}] SubjectDN [{}], but failed to process the request due to {}",
- new Object[]{uuid, request.getRemoteHost(), request.
- getRemotePort(), foundSubject, t.toString()});
+ timeWrapper.getSession().rollback();
+ logger.error("received DELETE for HOLD with ID {} from Remote Host: [{}] Port [{}] SubjectDN [{}], but failed to process the request due to {}",
+ new Object[]{uuid, request.getRemoteHost(), request.getRemotePort(), foundSubject, t.toString()});
if (logger.isDebugEnabled()) {
logger.error("", t);
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
index 7e2338a..81986ba 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
@@ -103,20 +103,13 @@ public class ListenHTTPServlet extends HttpServlet {
@Override
public void init(final ServletConfig config) throws ServletException {
final ServletContext context = config.getServletContext();
- this.logger = (ProcessorLog) context.
- getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_LOGGER);
- this.sessionFactoryHolder = (AtomicReference<ProcessSessionFactory>) context.
- getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_SESSION_FACTORY_HOLDER);
- this.processContext = (ProcessContext) context.
- getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_PROCESS_CONTEXT_HOLDER);
- this.authorizedPattern = (Pattern) context.
- getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_AUTHORITY_PATTERN);
- this.headerPattern = (Pattern) context.
- getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_HEADER_PATTERN);
- this.flowFileMap = (ConcurrentMap<String, FlowFileEntryTimeWrapper>) context.
- getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_FLOWFILE_MAP);
- this.streamThrottler = (StreamThrottler) context.
- getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_STREAM_THROTTLER);
+ this.logger = (ProcessorLog) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_LOGGER);
+ this.sessionFactoryHolder = (AtomicReference<ProcessSessionFactory>) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_SESSION_FACTORY_HOLDER);
+ this.processContext = (ProcessContext) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_PROCESS_CONTEXT_HOLDER);
+ this.authorizedPattern = (Pattern) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_AUTHORITY_PATTERN);
+ this.headerPattern = (Pattern) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_HEADER_PATTERN);
+ this.flowFileMap = (ConcurrentMap<String, FlowFileEntryTimeWrapper>) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_FLOWFILE_MAP);
+ this.streamThrottler = (StreamThrottler) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_STREAM_THROTTLER);
}
@Override
@@ -148,15 +141,12 @@ public class ListenHTTPServlet extends HttpServlet {
try {
final long n = filesReceived.getAndIncrement() % FILES_BEFORE_CHECKING_DESTINATION_SPACE;
if (n == 0 || !spaceAvailable.get()) {
- if (context.getAvailableRelationships().
- isEmpty()) {
+ if (context.getAvailableRelationships().isEmpty()) {
spaceAvailable.set(false);
if (logger.isDebugEnabled()) {
- logger.debug("Received request from " + request.
- getRemoteHost() + " but no space available; Indicating Service Unavailable");
+ logger.debug("Received request from " + request.getRemoteHost() + " but no space available; Indicating Service Unavailable");
}
- response.
- sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+ response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
return;
} else {
spaceAvailable.set(true);
@@ -164,32 +154,24 @@ public class ListenHTTPServlet extends HttpServlet {
}
response.setHeader("Content-Type", MediaType.TEXT_PLAIN);
- final boolean contentGzipped = Boolean.parseBoolean(request.
- getHeader(GZIPPED_HEADER));
+ final boolean contentGzipped = Boolean.parseBoolean(request.getHeader(GZIPPED_HEADER));
- final X509Certificate[] certs = (X509Certificate[]) request.
- getAttribute("javax.servlet.request.X509Certificate");
+ final X509Certificate[] certs = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate");
foundSubject = DEFAULT_FOUND_SUBJECT;
if (certs != null && certs.length > 0) {
for (final X509Certificate cert : certs) {
- foundSubject = cert.getSubjectDN().
- getName();
- if (authorizedPattern.matcher(foundSubject).
- matches()) {
+ foundSubject = cert.getSubjectDN().getName();
+ if (authorizedPattern.matcher(foundSubject).matches()) {
break;
} else {
- logger.
- warn("Rejecting transfer attempt from " + foundSubject + " because the DN is not authorized, host=" + request.
- getRemoteHost());
- response.
- sendError(HttpServletResponse.SC_FORBIDDEN, "not allowed based on dn");
+ logger.warn("Rejecting transfer attempt from " + foundSubject + " because the DN is not authorized, host=" + request.getRemoteHost());
+ response.sendError(HttpServletResponse.SC_FORBIDDEN, "not allowed based on dn");
return;
}
}
}
- final String destinationVersion = request.
- getHeader(PROTOCOL_VERSION_HEADER);
+ final String destinationVersion = request.getHeader(PROTOCOL_VERSION_HEADER);
Integer protocolVersion = null;
if (destinationVersion != null) {
try {
@@ -200,19 +182,15 @@ public class ListenHTTPServlet extends HttpServlet {
}
final boolean destinationIsLegacyNiFi = (protocolVersion == null);
- final boolean createHold = Boolean.parseBoolean(request.
- getHeader(FLOWFILE_CONFIRMATION_HEADER));
+ final boolean createHold = Boolean.parseBoolean(request.getHeader(FLOWFILE_CONFIRMATION_HEADER));
final String contentType = request.getContentType();
- final InputStream unthrottled = contentGzipped ? new GZIPInputStream(request.
- getInputStream()) : request.getInputStream();
+ final InputStream unthrottled = contentGzipped ? new GZIPInputStream(request.getInputStream()) : request.getInputStream();
- final InputStream in = (streamThrottler == null) ? unthrottled : streamThrottler.
- newThrottledInputStream(unthrottled);
+ final InputStream in = (streamThrottler == null) ? unthrottled : streamThrottler.newThrottledInputStream(unthrottled);
if (logger.isDebugEnabled()) {
- logger.
- debug("Received request from " + request.getRemoteHost() + ", createHold=" + createHold + ", content-type=" + contentType + ", gzip=" + contentGzipped);
+ logger.debug("Received request from " + request.getRemoteHost() + ", createHold=" + createHold + ", content-type=" + contentType + ", gzip=" + contentGzipped);
}
final AtomicBoolean hasMoreData = new AtomicBoolean(false);
@@ -241,21 +219,16 @@ public class ListenHTTPServlet extends HttpServlet {
IOUtils.copy(in, bos);
hasMoreData.set(false);
} else {
- attributes.putAll(unpackager.
- unpackageFlowFile(in, bos));
+ attributes.putAll(unpackager.unpackageFlowFile(in, bos));
if (destinationIsLegacyNiFi) {
if (attributes.containsKey("nf.file.name")) {
// for backward compatibility with old nifi...
- attributes.put(CoreAttributes.FILENAME.
- key(), attributes.
- remove("nf.file.name"));
+ attributes.put(CoreAttributes.FILENAME.key(), attributes.remove("nf.file.name"));
}
if (attributes.containsKey("nf.file.path")) {
- attributes.
- put(CoreAttributes.PATH.key(), attributes.
- remove("nf.file.path"));
+ attributes.put(CoreAttributes.PATH.key(), attributes.remove("nf.file.path"));
}
}
@@ -269,12 +242,10 @@ public class ListenHTTPServlet extends HttpServlet {
});
final long transferNanos = System.nanoTime() - startNanos;
- final long transferMillis = TimeUnit.MILLISECONDS.
- convert(transferNanos, TimeUnit.NANOSECONDS);
+ final long transferMillis = TimeUnit.MILLISECONDS.convert(transferNanos, TimeUnit.NANOSECONDS);
// put metadata on flowfile
- final String nameVal = request.
- getHeader(CoreAttributes.FILENAME.key());
+ final String nameVal = request.getHeader(CoreAttributes.FILENAME.key());
if (StringUtils.isNotBlank(nameVal)) {
attributes.put(CoreAttributes.FILENAME.key(), nameVal);
}
@@ -283,31 +254,24 @@ public class ListenHTTPServlet extends HttpServlet {
for (Enumeration<String> headerEnum = request.getHeaderNames();
headerEnum.hasMoreElements();) {
String headerName = headerEnum.nextElement();
- if (headerPattern != null && headerPattern.
- matcher(headerName).
- matches()) {
+ if (headerPattern != null && headerPattern.matcher(headerName).matches()) {
String headerValue = request.getHeader(headerName);
attributes.put(headerName, headerValue);
}
}
- String sourceSystemFlowFileIdentifier = attributes.
- get(CoreAttributes.UUID.key());
+ String sourceSystemFlowFileIdentifier = attributes.get(CoreAttributes.UUID.key());
if (sourceSystemFlowFileIdentifier != null) {
sourceSystemFlowFileIdentifier = "urn:nifi:" + sourceSystemFlowFileIdentifier;
// If we receveied a UUID, we want to give the FlowFile a new UUID and register the sending system's
// identifier as the SourceSystemFlowFileIdentifier field in the Provenance RECEIVE event
- attributes.put(CoreAttributes.UUID.key(), UUID.randomUUID().
- toString());
+ attributes.put(CoreAttributes.UUID.key(), UUID.randomUUID().toString());
}
flowFile = session.putAllAttributes(flowFile, attributes);
- session.getProvenanceReporter().
- receive(flowFile, request.getRequestURL().
- toString(), sourceSystemFlowFileIdentifier, "Remote DN=" + foundSubject, transferMillis);
- flowFile = session.
- putAttribute(flowFile, "restlistener.remote.user.dn", foundSubject);
+ session.getProvenanceReporter().receive(flowFile, request.getRequestURL().toString(), sourceSystemFlowFileIdentifier, "Remote DN=" + foundSubject, transferMillis);
+ flowFile = session.putAttribute(flowFile, "restlistener.remote.user.dn", foundSubject);
flowFileSet.add(flowFile);
if (holdUuid == null) {
@@ -316,45 +280,34 @@ public class ListenHTTPServlet extends HttpServlet {
} while (hasMoreData.get());
if (createHold) {
- String uuid = (holdUuid == null) ? UUID.randomUUID().
- toString() : holdUuid;
+ String uuid = (holdUuid == null) ? UUID.randomUUID().toString() : holdUuid;
if (flowFileMap.containsKey(uuid)) {
- uuid = UUID.randomUUID().
- toString();
+ uuid = UUID.randomUUID().toString();
}
- final FlowFileEntryTimeWrapper wrapper = new FlowFileEntryTimeWrapper(session, flowFileSet, System.
- currentTimeMillis());
+ final FlowFileEntryTimeWrapper wrapper = new FlowFileEntryTimeWrapper(session, flowFileSet, System.currentTimeMillis());
FlowFileEntryTimeWrapper previousWrapper;
do {
previousWrapper = flowFileMap.putIfAbsent(uuid, wrapper);
if (previousWrapper != null) {
- uuid = UUID.randomUUID().
- toString();
+ uuid = UUID.randomUUID().toString();
}
} while (previousWrapper != null);
response.setStatus(HttpServletResponse.SC_SEE_OTHER);
final String ackUri = ListenHTTP.URI + "/holds/" + uuid;
response.addHeader(LOCATION_HEADER_NAME, ackUri);
- response.
- addHeader(LOCATION_URI_INTENT_NAME, LOCATION_URI_INTENT_VALUE);
- response.getOutputStream().
- write(ackUri.getBytes("UTF-8"));
+ response.addHeader(LOCATION_URI_INTENT_NAME, LOCATION_URI_INTENT_VALUE);
+ response.getOutputStream().write(ackUri.getBytes("UTF-8"));
if (logger.isDebugEnabled()) {
- logger.
- debug("Ingested {} from Remote Host: [{}] Port [{}] SubjectDN [{}]; placed hold on these {} files with ID {}",
- new Object[]{flowFileSet, request.
- getRemoteHost(), request.getRemotePort(), foundSubject, flowFileSet.
- size(), uuid});
+ logger.debug("Ingested {} from Remote Host: [{}] Port [{}] SubjectDN [{}]; placed hold on these {} files with ID {}",
+ new Object[]{flowFileSet, request.getRemoteHost(), request.getRemotePort(), foundSubject, flowFileSet.size(), uuid});
}
} else {
response.setStatus(HttpServletResponse.SC_OK);
- logger.
- info("Received from Remote Host: [{}] Port [{}] SubjectDN [{}]; transferring to 'success' {}",
- new Object[]{request.getRemoteHost(), request.
- getRemotePort(), foundSubject, flowFile});
+ logger.info("Received from Remote Host: [{}] Port [{}] SubjectDN [{}]; transferring to 'success' {}",
+ new Object[]{request.getRemoteHost(), request.getRemotePort(), foundSubject, flowFile});
session.transfer(flowFileSet, ListenHTTP.RELATIONSHIP_SUCCESS);
session.commit();
@@ -362,16 +315,13 @@ public class ListenHTTPServlet extends HttpServlet {
} catch (final Throwable t) {
session.rollback();
if (flowFile == null) {
- logger.
- error("Unable to receive file from Remote Host: [{}] SubjectDN [{}] due to {}", new Object[]{request.
- getRemoteHost(), foundSubject, t});
+ logger.error("Unable to receive file from Remote Host: [{}] SubjectDN [{}] due to {}",
+ new Object[]{request.getRemoteHost(), foundSubject, t});
} else {
- logger.
- error("Unable to receive file {} from Remote Host: [{}] SubjectDN [{}] due to {}", new Object[]{flowFile, request.
- getRemoteHost(), foundSubject, t});
+ logger.error("Unable to receive file {} from Remote Host: [{}] SubjectDN [{}] due to {}",
+ new Object[]{flowFile, request.getRemoteHost(), foundSubject, t});
}
- response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, t.
- toString());
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, t.toString());
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java
index aa5cdc3..c9d906d 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/Bin.java
@@ -46,8 +46,7 @@ public class Bin {
* @param minEntries
* @param maxEntries
* @param fileCountAttribute
- * @throws IllegalArgumentException if the min is not less than or equal to
- * the max.
+ * @throws IllegalArgumentException if the min is not less than or equal to the max.
*/
public Bin(final long minSizeBytes, final long maxSizeBytes, final int minEntries, final int maxEntries, final String fileCountAttribute) {
this.minimumSizeBytes = minSizeBytes;
@@ -63,11 +62,8 @@ public class Bin {
}
/**
- * Indicates whether the bin has enough items to be considered full. This is
- * based on whether the current size of the bin is greater than the minimum
- * size in bytes and based on having a number of successive unsuccessful
- * attempts to add a new item (because it is so close to the max or the size
- * of the objects being attempted do not favor tight packing)
+ * Indicates whether the bin has enough items to be considered full. This is based on whether the current size of the bin is greater than the minimum size in bytes and based on having a number of
+ * successive unsuccessful attempts to add a new item (because it is so close to the max or the size of the objects being attempted do not favor tight packing)
*
* @return true if considered full; false otherwise
*/
@@ -90,8 +86,7 @@ public class Bin {
*
* @param duration
* @param unit
- * @return true if this bin is older than the length of time given; false
- * otherwise
+ * @return true if this bin is older than the length of time given; false otherwise
*/
public boolean isOlderThan(final int duration, final TimeUnit unit) {
final long ageInNanos = System.nanoTime() - creationMomentEpochNs;
@@ -109,16 +104,14 @@ public class Bin {
}
/**
- * If this bin has enough room for the size of the given flow file then it
- * is added otherwise it is not
+ * If this bin has enough room for the size of the given flow file then it is added otherwise it is not
*
* @param flowFile
* @param session the ProcessSession to which the FlowFile belongs
* @return true if added; false otherwise
*/
public boolean offer(final FlowFile flowFile, final ProcessSession session) {
- if (((size + flowFile.getSize()) > maximumSizeBytes) || (binContents.
- size() >= maximumEntries)) {
+ if (((size + flowFile.getSize()) > maximumSizeBytes) || (binContents.size() >= maximumEntries)) {
successiveFailedOfferings++;
return false;
}
@@ -144,8 +137,7 @@ public class Bin {
if (value == null) {
return null;
}
- if (!intPattern.matcher(value).
- matches()) {
+ if (!intPattern.matcher(value).matches()) {
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java
index eeadfa6..9d0e857 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java
@@ -60,10 +60,8 @@ public class BinManager {
try {
for (final List<Bin> binList : groupBinMap.values()) {
for (final Bin bin : binList) {
- for (final FlowFileSessionWrapper wrapper : bin.
- getContents()) {
- wrapper.getSession().
- rollback();
+ for (final FlowFileSessionWrapper wrapper : bin.getContents()) {
+ wrapper.getSession().rollback();
}
}
}
@@ -108,15 +106,12 @@ public class BinManager {
}
/**
- * Adds the given flowFile to the first available bin in which it fits for
- * the given group or creates a new bin in the specified group if necessary.
+ * Adds the given flowFile to the first available bin in which it fits for the given group or creates a new bin in the specified group if necessary.
* <p/>
- * @param groupIdentifier the group to which the flow file belongs; can be
- * null
+ * @param groupIdentifier the group to which the flow file belongs; can be null
* @param flowFile the flow file to bin
* @param session the ProcessSession to which the FlowFile belongs
- * @return true if added; false if no bin exists which can fit this item and
- * no bin can be created based on current min/max criteria
+ * @return true if added; false if no bin exists which can fit this item and no bin can be created based on current min/max criteria
*/
public boolean offer(final String groupIdentifier, final FlowFile flowFile, final ProcessSession session) {
final long currentMaxSizeBytes = maxSizeBytes.get();
@@ -128,8 +123,7 @@ public class BinManager {
final List<Bin> currentBins = groupBinMap.get(groupIdentifier);
if (currentBins == null) { // this is a new group we need to register
final List<Bin> bins = new ArrayList<>();
- final Bin bin = new Bin(minSizeBytes.get(), currentMaxSizeBytes, minEntries.
- get(), maxEntries.get(), fileCountAttribute.get());
+ final Bin bin = new Bin(minSizeBytes.get(), currentMaxSizeBytes, minEntries.get(), maxEntries.get(), fileCountAttribute.get());
bins.add(bin);
groupBinMap.put(groupIdentifier, bins);
binCount++;
@@ -143,8 +137,7 @@ public class BinManager {
}
//if we've reached this point then we couldn't fit it into any existing bins - gotta make a new one
- final Bin bin = new Bin(minSizeBytes.get(), currentMaxSizeBytes, minEntries.
- get(), maxEntries.get(), fileCountAttribute.get());
+ final Bin bin = new Bin(minSizeBytes.get(), currentMaxSizeBytes, minEntries.get(), maxEntries.get(), fileCountAttribute.get());
currentBins.add(bin);
binCount++;
return bin.offer(flowFile, session);
@@ -155,12 +148,10 @@ public class BinManager {
}
/**
- * Finds all bins that are considered full and removes them from the
- * manager.
+ * Finds all bins that are considered full and removes them from the manager.
* <p/>
- * @param relaxFullnessConstraint if false will require bins to be full
- * before considered ready; if true bins only have to meet their minimum
- * size criteria or be 'old' and then they'll be considered ready
+ * @param relaxFullnessConstraint if false will require bins to be full before considered ready; if true bins only have to meet their minimum size criteria or be 'old' and then they'll be
+ * considered ready
* @return
*/
public Collection<Bin> removeReadyBins(boolean relaxFullnessConstraint) {
@@ -169,12 +160,10 @@ public class BinManager {
wLock.lock();
try {
- for (final Map.Entry<String, List<Bin>> group : groupBinMap.
- entrySet()) {
+ for (final Map.Entry<String, List<Bin>> group : groupBinMap.entrySet()) {
final List<Bin> remainingBins = new ArrayList<>();
for (final Bin bin : group.getValue()) {
- if (relaxFullnessConstraint && (bin.isFullEnough() || bin.
- isOlderThan(maxBinAgeSeconds.get(), TimeUnit.SECONDS))) { //relaxed check
+ if (relaxFullnessConstraint && (bin.isFullEnough() || bin.isOlderThan(maxBinAgeSeconds.get(), TimeUnit.SECONDS))) { //relaxed check
readyBins.add(bin);
} else if (!relaxFullnessConstraint && bin.isFull()) { //strict check
readyBins.add(bin);
@@ -201,8 +190,7 @@ public class BinManager {
Bin oldestBin = null;
String oldestBinGroup = null;
- for (final Map.Entry<String, List<Bin>> group : groupBinMap.
- entrySet()) {
+ for (final Map.Entry<String, List<Bin>> group : groupBinMap.entrySet()) {
for (final Bin bin : group.getValue()) {
if (oldestBin == null || bin.isOlderThan(oldestBin)) {
oldestBin = bin;
@@ -235,8 +223,7 @@ public class BinManager {
try {
for (final List<Bin> bins : groupBinMap.values()) {
for (final Bin bin : bins) {
- if (bin.
- isOlderThan(maxBinAgeSeconds.get(), TimeUnit.SECONDS)) {
+ if (bin.isOlderThan(maxBinAgeSeconds.get(), TimeUnit.SECONDS)) {
return true;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java
index 3131f40..8520813 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/DocumentReaderCallback.java
@@ -36,8 +36,7 @@ public class DocumentReaderCallback implements InputStreamCallback {
/**
* Creates a new DocumentReaderCallback .
*
- * @param isNamespaceAware Whether or not the parse should consider
- * namespaces
+ * @param isNamespaceAware Whether or not the parse should consider namespaces
*/
public DocumentReaderCallback(boolean isNamespaceAware) {
this.isNamespaceAware = isNamespaceAware;
@@ -52,8 +51,7 @@ public class DocumentReaderCallback implements InputStreamCallback {
@Override
public void process(final InputStream stream) throws IOException {
try {
- DocumentBuilderFactory factory = DocumentBuilderFactory.
- newInstance();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setNamespaceAware(isNamespaceAware);
DocumentBuilder builder = factory.newDocumentBuilder();
document = builder.parse(stream);
[10/12] incubator-nifi git commit: NIFI-271
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
index 53ed961..46629fe 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java
@@ -62,35 +62,35 @@ public class ScanAttribute extends AbstractProcessor {
public static final String MATCH_CRITERIA_ALL = "All Must Match";
public static final String MATCH_CRITERIA_ANY = "At Least 1 Must Match";
- public static final PropertyDescriptor MATCHING_CRITERIA = new PropertyDescriptor.Builder().
- name("Match Criteria").
- description("If set to All Must Match, then FlowFiles will be routed to 'matched' only if all specified "
+ public static final PropertyDescriptor MATCHING_CRITERIA = new PropertyDescriptor.Builder()
+ .name("Match Criteria")
+ .description("If set to All Must Match, then FlowFiles will be routed to 'matched' only if all specified "
+ "attributes' values are found in the dictionary. If set to At Least 1 Must Match, FlowFiles will "
- + "be routed to 'matched' if any attribute specified is found in the dictionary").
- required(true).
- allowableValues(MATCH_CRITERIA_ANY, MATCH_CRITERIA_ALL).
- defaultValue(MATCH_CRITERIA_ANY).
- build();
- public static final PropertyDescriptor ATTRIBUTE_PATTERN = new PropertyDescriptor.Builder().
- name("Attribute Pattern").
- description("Regular Expression that specifies the names of attributes whose values will be matched against the terms in the dictionary").
- required(true).
- addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR).
- defaultValue(".*").
- build();
- public static final PropertyDescriptor DICTIONARY_FILE = new PropertyDescriptor.Builder().
- name("Dictionary File").
- description("A new-line-delimited text file that includes the terms that should trigger a match. Empty lines are ignored.").
- required(true).
- addValidator(StandardValidators.FILE_EXISTS_VALIDATOR).
- build();
- public static final PropertyDescriptor DICTIONARY_FILTER = new PropertyDescriptor.Builder().
- name("Dictionary Filter Pattern").
- description("A Regular Expression that will be applied to each line in the dictionary file. If the regular expression does not match the line, the line will not be included in the list of terms to search for. If a Matching Group is specified, only the portion of the term that matches that Matching Group will be used instead of the entire term. If not specified, all terms in the dictionary will be used and each term will consist of the text of the entire line in the file").
- required(false).
- addValidator(StandardValidators.createRegexValidator(0, 1, false)).
- defaultValue(null).
- build();
+ + "be routed to 'matched' if any attribute specified is found in the dictionary")
+ .required(true)
+ .allowableValues(MATCH_CRITERIA_ANY, MATCH_CRITERIA_ALL)
+ .defaultValue(MATCH_CRITERIA_ANY)
+ .build();
+ public static final PropertyDescriptor ATTRIBUTE_PATTERN = new PropertyDescriptor.Builder()
+ .name("Attribute Pattern")
+ .description("Regular Expression that specifies the names of attributes whose values will be matched against the terms in the dictionary")
+ .required(true)
+ .addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR)
+ .defaultValue(".*")
+ .build();
+ public static final PropertyDescriptor DICTIONARY_FILE = new PropertyDescriptor.Builder()
+ .name("Dictionary File")
+ .description("A new-line-delimited text file that includes the terms that should trigger a match. Empty lines are ignored.")
+ .required(true)
+ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor DICTIONARY_FILTER = new PropertyDescriptor.Builder()
+ .name("Dictionary Filter Pattern")
+ .description("A Regular Expression that will be applied to each line in the dictionary file. If the regular expression does not match the line, the line will not be included in the list of terms to search for. If a Matching Group is specified, only the portion of the term that matches that Matching Group will be used instead of the entire term. If not specified, all terms in the dictionary will be used and each term will consist of the text of the entire line in the file")
+ .required(false)
+ .addValidator(StandardValidators.createRegexValidator(0, 1, false))
+ .defaultValue(null)
+ .build();
private List<PropertyDescriptor> properties;
private Set<Relationship> relationships;
@@ -100,14 +100,14 @@ public class ScanAttribute extends AbstractProcessor {
private volatile Set<String> dictionaryTerms = null;
private volatile SynchronousFileWatcher fileWatcher = null;
- public static final Relationship REL_MATCHED = new Relationship.Builder().
- name("matched").
- description("FlowFiles whose attributes are found in the dictionary will be routed to this relationship").
- build();
- public static final Relationship REL_UNMATCHED = new Relationship.Builder().
- name("unmatched").
- description("FlowFiles whose attributes are not found in the dictionary will be routed to this relationship").
- build();
+ public static final Relationship REL_MATCHED = new Relationship.Builder()
+ .name("matched")
+ .description("FlowFiles whose attributes are found in the dictionary will be routed to this relationship")
+ .build();
+ public static final Relationship REL_UNMATCHED = new Relationship.Builder()
+ .name("unmatched")
+ .description("FlowFiles whose attributes are not found in the dictionary will be routed to this relationship")
+ .build();
@Override
protected void init(final ProcessorInitializationContext context) {
@@ -136,41 +136,32 @@ public class ScanAttribute extends AbstractProcessor {
@OnScheduled
public void onScheduled(final ProcessContext context) throws IOException {
- final String filterRegex = context.getProperty(DICTIONARY_FILTER).
- getValue();
- this.dictionaryFilterPattern = (filterRegex == null) ? null : Pattern.
- compile(filterRegex);
+ final String filterRegex = context.getProperty(DICTIONARY_FILTER).getValue();
+ this.dictionaryFilterPattern = (filterRegex == null) ? null : Pattern.compile(filterRegex);
- final String attributeRegex = context.getProperty(ATTRIBUTE_PATTERN).
- getValue();
- this.attributePattern = (attributeRegex.equals(".*")) ? null : Pattern.
- compile(attributeRegex);
+ final String attributeRegex = context.getProperty(ATTRIBUTE_PATTERN).getValue();
+ this.attributePattern = (attributeRegex.equals(".*")) ? null : Pattern.compile(attributeRegex);
this.dictionaryTerms = createDictionary(context);
- this.fileWatcher = new SynchronousFileWatcher(Paths.get(context.
- getProperty(DICTIONARY_FILE).
- getValue()), new LastModifiedMonitor(), 1000L);
+ this.fileWatcher = new SynchronousFileWatcher(Paths.get(context.getProperty(DICTIONARY_FILE).getValue()), new LastModifiedMonitor(), 1000L);
}
private Set<String> createDictionary(final ProcessContext context) throws IOException {
final Set<String> terms = new HashSet<>();
- final File file = new File(context.getProperty(DICTIONARY_FILE).
- getValue());
+ final File file = new File(context.getProperty(DICTIONARY_FILE).getValue());
try (final InputStream fis = new FileInputStream(file);
final BufferedReader reader = new BufferedReader(new InputStreamReader(fis))) {
String line;
while ((line = reader.readLine()) != null) {
- if (line.trim().
- isEmpty()) {
+ if (line.trim().isEmpty()) {
continue;
}
String matchingTerm = line;
if (dictionaryFilterPattern != null) {
- final Matcher matcher = dictionaryFilterPattern.
- matcher(line);
+ final Matcher matcher = dictionaryFilterPattern.matcher(line);
if (!matcher.matches()) {
continue;
}
@@ -207,27 +198,20 @@ public class ScanAttribute extends AbstractProcessor {
logger.error("Unable to reload dictionary due to {}", e);
}
- final boolean matchAll = context.getProperty(MATCHING_CRITERIA).
- getValue().
- equals(MATCH_CRITERIA_ALL);
+ final boolean matchAll = context.getProperty(MATCHING_CRITERIA).getValue().equals(MATCH_CRITERIA_ALL);
for (final FlowFile flowFile : flowFiles) {
final boolean matched = matchAll ? allMatch(flowFile, attributePattern, dictionaryTerms) : anyMatch(flowFile, attributePattern, dictionaryTerms);
final Relationship relationship = matched ? REL_MATCHED : REL_UNMATCHED;
- session.getProvenanceReporter().
- route(flowFile, relationship);
+ session.getProvenanceReporter().route(flowFile, relationship);
session.transfer(flowFile, relationship);
- logger.
- info("Transferred {} to {}", new Object[]{flowFile, relationship});
+ logger.info("Transferred {} to {}", new Object[]{flowFile, relationship});
}
}
private boolean allMatch(final FlowFile flowFile, final Pattern attributePattern, final Set<String> dictionary) {
- for (final Map.Entry<String, String> entry : flowFile.getAttributes().
- entrySet()) {
- if (attributePattern == null || attributePattern.matcher(entry.
- getKey()).
- matches()) {
+ for (final Map.Entry<String, String> entry : flowFile.getAttributes().entrySet()) {
+ if (attributePattern == null || attributePattern.matcher(entry.getKey()).matches()) {
if (!dictionary.contains(entry.getValue())) {
return false;
}
@@ -238,11 +222,8 @@ public class ScanAttribute extends AbstractProcessor {
}
private boolean anyMatch(final FlowFile flowFile, final Pattern attributePattern, final Set<String> dictionary) {
- for (final Map.Entry<String, String> entry : flowFile.getAttributes().
- entrySet()) {
- if (attributePattern == null || attributePattern.matcher(entry.
- getKey()).
- matches()) {
+ for (final Map.Entry<String, String> entry : flowFile.getAttributes().entrySet()) {
+ if (attributePattern == null || attributePattern.matcher(entry.getKey()).matches()) {
if (dictionary.contains(entry.getValue())) {
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
index 28d48ad..ab5e8b5 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java
@@ -74,31 +74,31 @@ public class ScanContent extends AbstractProcessor {
public static final String BINARY_ENCODING = "binary";
public static final String MATCH_ATTRIBUTE_KEY = "matching.term";
- public static final PropertyDescriptor DICTIONARY = new PropertyDescriptor.Builder().
- name("Dictionary File").
- description("The filename of the terms dictionary").
- required(true).
- addValidator(StandardValidators.FILE_EXISTS_VALIDATOR).
- build();
- public static final PropertyDescriptor DICTIONARY_ENCODING = new PropertyDescriptor.Builder().
- name("Dictionary Encoding").
- description("Indicates how the dictionary is encoded. If 'text', dictionary terms are new-line delimited and UTF-8 encoded; "
- + "if 'binary', dictionary terms are denoted by a 4-byte integer indicating the term length followed by the term itself").
- required(true).
- allowableValues(TEXT_ENCODING, BINARY_ENCODING).
- defaultValue(TEXT_ENCODING).
- build();
-
- public static final Relationship REL_MATCH = new Relationship.Builder().
- name("matched").
- description("FlowFiles that match at least one "
- + "term in the dictionary are routed to this relationship").
- build();
- public static final Relationship REL_NO_MATCH = new Relationship.Builder().
- name("unmatched").
- description("FlowFiles that do not match any "
- + "term in the dictionary are routed to this relationship").
- build();
+ public static final PropertyDescriptor DICTIONARY = new PropertyDescriptor.Builder()
+ .name("Dictionary File")
+ .description("The filename of the terms dictionary")
+ .required(true)
+ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor DICTIONARY_ENCODING = new PropertyDescriptor.Builder()
+ .name("Dictionary Encoding")
+ .description("Indicates how the dictionary is encoded. If 'text', dictionary terms are new-line delimited and UTF-8 encoded; "
+ + "if 'binary', dictionary terms are denoted by a 4-byte integer indicating the term length followed by the term itself")
+ .required(true)
+ .allowableValues(TEXT_ENCODING, BINARY_ENCODING)
+ .defaultValue(TEXT_ENCODING)
+ .build();
+
+ public static final Relationship REL_MATCH = new Relationship.Builder()
+ .name("matched")
+ .description("FlowFiles that match at least one "
+ + "term in the dictionary are routed to this relationship")
+ .build();
+ public static final Relationship REL_NO_MATCH = new Relationship.Builder()
+ .name("unmatched")
+ .description("FlowFiles that do not match any "
+ + "term in the dictionary are routed to this relationship")
+ .build();
public static final Charset UTF8 = Charset.forName("UTF-8");
@@ -135,8 +135,7 @@ public class ScanContent extends AbstractProcessor {
@Override
public void onPropertyModified(final PropertyDescriptor descriptor, final String oldValue, final String newValue) {
if (descriptor.equals(DICTIONARY)) {
- fileWatcherRef.
- set(new SynchronousFileWatcher(Paths.get(newValue), new LastModifiedMonitor(), 60000L));
+ fileWatcherRef.set(new SynchronousFileWatcher(Paths.get(newValue), new LastModifiedMonitor(), 60000L));
}
}
@@ -154,14 +153,10 @@ public class ScanContent extends AbstractProcessor {
final Search<byte[]> search = new AhoCorasick<>();
final Set<SearchTerm<byte[]>> terms = new HashSet<>();
- final InputStream inStream = Files.newInputStream(Paths.
- get(context.getProperty(DICTIONARY).
- getValue()), StandardOpenOption.READ);
+ final InputStream inStream = Files.newInputStream(Paths.get(context.getProperty(DICTIONARY).getValue()), StandardOpenOption.READ);
final TermLoader termLoader;
- if (context.getProperty(DICTIONARY_ENCODING).
- getValue().
- equalsIgnoreCase(TEXT_ENCODING)) {
+ if (context.getProperty(DICTIONARY_ENCODING).getValue().equalsIgnoreCase(TEXT_ENCODING)) {
termLoader = new TextualTermLoader(inStream);
} else {
termLoader = new BinaryTermLoader(inStream);
@@ -175,10 +170,7 @@ public class ScanContent extends AbstractProcessor {
search.initializeDictionary(terms);
searchRef.set(search);
- logger.
- info("Loaded search dictionary from {}", new Object[]{context.
- getProperty(DICTIONARY).
- getValue()});
+ logger.info("Loaded search dictionary from {}", new Object[]{context.getProperty(DICTIONARY).getValue()});
return true;
} finally {
termLoader.close();
@@ -231,13 +223,9 @@ public class ScanContent extends AbstractProcessor {
@Override
public void process(final InputStream rawIn) throws IOException {
try (final InputStream in = new BufferedInputStream(rawIn)) {
- final SearchState<byte[]> searchResult = finalSearch.
- search(in, false);
+ final SearchState<byte[]> searchResult = finalSearch.search(in, false);
if (searchResult.foundMatch()) {
- termRef.set(searchResult.getResults().
- keySet().
- iterator().
- next());
+ termRef.set(searchResult.getResults().keySet().iterator().next());
}
}
}
@@ -246,17 +234,13 @@ public class ScanContent extends AbstractProcessor {
final SearchTerm<byte[]> matchingTerm = termRef.get();
if (matchingTerm == null) {
logger.info("Routing {} to 'unmatched'", new Object[]{flowFile});
- session.getProvenanceReporter().
- route(flowFile, REL_NO_MATCH);
+ session.getProvenanceReporter().route(flowFile, REL_NO_MATCH);
session.transfer(flowFile, REL_NO_MATCH);
} else {
final String matchingTermString = matchingTerm.toString(UTF8);
- logger.
- info("Routing {} to 'matched' because it matched term {}", new Object[]{flowFile, matchingTermString});
- flowFile = session.
- putAttribute(flowFile, MATCH_ATTRIBUTE_KEY, matchingTermString);
- session.getProvenanceReporter().
- route(flowFile, REL_MATCH);
+ logger.info("Routing {} to 'matched' because it matched term {}", new Object[]{flowFile, matchingTermString});
+ flowFile = session.putAttribute(flowFile, MATCH_ATTRIBUTE_KEY, matchingTermString);
+ session.getProvenanceReporter().route(flowFile, REL_MATCH);
session.transfer(flowFile, REL_MATCH);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java
index 071f6fb..e5e90ea 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java
@@ -83,22 +83,22 @@ public class SegmentContent extends AbstractProcessor {
public static final String FRAGMENT_INDEX = "fragment.index";
public static final String FRAGMENT_COUNT = "fragment.count";
- public static final PropertyDescriptor SIZE = new PropertyDescriptor.Builder().
- name("Segment Size").
- description("The maximum data size for each segment").
- addValidator(StandardValidators.DATA_SIZE_VALIDATOR).
- required(true).
- build();
-
- public static final Relationship REL_SEGMENTS = new Relationship.Builder().
- name("segments").
- description("All segments will be sent to this relationship. If the file was small enough that it was not segmented, "
- + "a copy of the original is sent to this relationship as well as original").
- build();
- public static final Relationship REL_ORIGINAL = new Relationship.Builder().
- name("original").
- description("The original FlowFile will be sent to this relationship").
- build();
+ public static final PropertyDescriptor SIZE = new PropertyDescriptor.Builder()
+ .name("Segment Size")
+ .description("The maximum data size for each segment")
+ .addValidator(StandardValidators.DATA_SIZE_VALIDATOR)
+ .required(true)
+ .build();
+
+ public static final Relationship REL_SEGMENTS = new Relationship.Builder()
+ .name("segments")
+ .description("All segments will be sent to this relationship. If the file was small enough that it was not segmented, "
+ + "a copy of the original is sent to this relationship as well as original")
+ .build();
+ public static final Relationship REL_ORIGINAL = new Relationship.Builder()
+ .name("original")
+ .description("The original FlowFile will be sent to this relationship")
+ .build();
private Set<Relationship> relationships;
private List<PropertyDescriptor> propertyDescriptors;
@@ -132,21 +132,16 @@ public class SegmentContent extends AbstractProcessor {
return;
}
- final String segmentId = UUID.randomUUID().
- toString();
- final long segmentSize = context.getProperty(SIZE).
- asDataSize(DataUnit.B).
- longValue();
+ final String segmentId = UUID.randomUUID().toString();
+ final long segmentSize = context.getProperty(SIZE).asDataSize(DataUnit.B).longValue();
- final String originalFileName = flowFile.
- getAttribute(CoreAttributes.FILENAME.key());
+ final String originalFileName = flowFile.getAttribute(CoreAttributes.FILENAME.key());
if (flowFile.getSize() <= segmentSize) {
flowFile = session.putAttribute(flowFile, SEGMENT_ID, segmentId);
flowFile = session.putAttribute(flowFile, SEGMENT_INDEX, "1");
flowFile = session.putAttribute(flowFile, SEGMENT_COUNT, "1");
- flowFile = session.
- putAttribute(flowFile, SEGMENT_ORIGINAL_FILENAME, originalFileName);
+ flowFile = session.putAttribute(flowFile, SEGMENT_ORIGINAL_FILENAME, originalFileName);
flowFile = session.putAttribute(flowFile, FRAGMENT_ID, segmentId);
flowFile = session.putAttribute(flowFile, FRAGMENT_INDEX, "1");
@@ -174,8 +169,7 @@ public class SegmentContent extends AbstractProcessor {
final Set<FlowFile> segmentSet = new HashSet<>();
for (int i = 1; i <= totalSegments; i++) {
final long segmentOffset = segmentSize * (i - 1);
- FlowFile segment = session.clone(flowFile, segmentOffset, Math.
- min(segmentSize, flowFile.getSize() - segmentOffset));
+ FlowFile segment = session.clone(flowFile, segmentOffset, Math.min(segmentSize, flowFile.getSize() - segmentOffset));
segmentAttributes.put(SEGMENT_INDEX, String.valueOf(i));
segmentAttributes.put(FRAGMENT_INDEX, String.valueOf(i));
segment = session.putAllAttributes(segment, segmentAttributes);
@@ -186,11 +180,9 @@ public class SegmentContent extends AbstractProcessor {
session.transfer(flowFile, REL_ORIGINAL);
if (totalSegments <= 10) {
- getLogger().
- info("Segmented {} into {} segments: {}", new Object[]{flowFile, totalSegments, segmentSet});
+ getLogger().info("Segmented {} into {} segments: {}", new Object[]{flowFile, totalSegments, segmentSet});
} else {
- getLogger().
- info("Segmented {} into {} segments", new Object[]{flowFile, totalSegments});
+ getLogger().info("Segmented {} into {} segments", new Object[]{flowFile, totalSegments});
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java
index 1c9a8c5..cfa0bda 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java
@@ -85,43 +85,43 @@ public class SplitContent extends AbstractProcessor {
static final AllowableValue TRAILING_POSITION = new AllowableValue("Trailing", "Trailing", "Keep the Byte Sequence at the end of the first split if <Keep Byte Sequence> is true");
static final AllowableValue LEADING_POSITION = new AllowableValue("Leading", "Leading", "Keep the Byte Sequence at the beginning of the second split if <Keep Byte Sequence> is true");
- public static final PropertyDescriptor FORMAT = new PropertyDescriptor.Builder().
- name("Byte Sequence Format").
- description("Specifies how the <Byte Sequence> property should be interpreted").
- required(true).
- allowableValues(HEX_FORMAT, UTF8_FORMAT).
- defaultValue(HEX_FORMAT.getValue()).
- build();
- public static final PropertyDescriptor BYTE_SEQUENCE = new PropertyDescriptor.Builder().
- name("Byte Sequence").
- description("A representation of bytes to look for and upon which to split the source file into separate files").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- required(true).
- build();
- public static final PropertyDescriptor KEEP_SEQUENCE = new PropertyDescriptor.Builder().
- name("Keep Byte Sequence").
- description("Determines whether or not the Byte Sequence should be included with each Split").
- required(true).
- allowableValues("true", "false").
- defaultValue("false").
- build();
- public static final PropertyDescriptor BYTE_SEQUENCE_LOCATION = new PropertyDescriptor.Builder().
- name("Byte Sequence Location").
- description("If <Keep Byte Sequence> is set to true, specifies whether the byte sequence should be added to the end of the first "
- + "split or the beginning of the second; if <Keep Byte Sequence> is false, this property is ignored.").
- required(true).
- allowableValues(TRAILING_POSITION, LEADING_POSITION).
- defaultValue(TRAILING_POSITION.getValue()).
- build();
+ public static final PropertyDescriptor FORMAT = new PropertyDescriptor.Builder()
+ .name("Byte Sequence Format")
+ .description("Specifies how the <Byte Sequence> property should be interpreted")
+ .required(true)
+ .allowableValues(HEX_FORMAT, UTF8_FORMAT)
+ .defaultValue(HEX_FORMAT.getValue())
+ .build();
+ public static final PropertyDescriptor BYTE_SEQUENCE = new PropertyDescriptor.Builder()
+ .name("Byte Sequence")
+ .description("A representation of bytes to look for and upon which to split the source file into separate files")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .required(true)
+ .build();
+ public static final PropertyDescriptor KEEP_SEQUENCE = new PropertyDescriptor.Builder()
+ .name("Keep Byte Sequence")
+ .description("Determines whether or not the Byte Sequence should be included with each Split")
+ .required(true)
+ .allowableValues("true", "false")
+ .defaultValue("false")
+ .build();
+ public static final PropertyDescriptor BYTE_SEQUENCE_LOCATION = new PropertyDescriptor.Builder()
+ .name("Byte Sequence Location")
+ .description("If <Keep Byte Sequence> is set to true, specifies whether the byte sequence should be added to the end of the first "
+ + "split or the beginning of the second; if <Keep Byte Sequence> is false, this property is ignored.")
+ .required(true)
+ .allowableValues(TRAILING_POSITION, LEADING_POSITION)
+ .defaultValue(TRAILING_POSITION.getValue())
+ .build();
public static final Relationship REL_SPLITS = new Relationship.Builder()
- .name("splits").
- description("All Splits will be routed to the splits relationship").
- build();
+ .name("splits")
+ .description("All Splits will be routed to the splits relationship")
+ .build();
public static final Relationship REL_ORIGINAL = new Relationship.Builder()
- .name("original").
- description("The original file").
- build();
+ .name("original")
+ .description("The original file")
+ .build();
private Set<Relationship> relationships;
private List<PropertyDescriptor> properties;
@@ -156,15 +156,10 @@ public class SplitContent extends AbstractProcessor {
@Override
protected Collection<ValidationResult> customValidate(final ValidationContext validationContext) {
final List<ValidationResult> results = new ArrayList<>(1);
- final String format = validationContext.getProperty(FORMAT).
- getValue();
- if (HEX_FORMAT.getValue().
- equals(format)) {
- final String byteSequence = validationContext.
- getProperty(BYTE_SEQUENCE).
- getValue();
- final ValidationResult result = new HexStringPropertyValidator().
- validate(BYTE_SEQUENCE.getName(), byteSequence, validationContext);
+ final String format = validationContext.getProperty(FORMAT).getValue();
+ if (HEX_FORMAT.getValue().equals(format)) {
+ final String byteSequence = validationContext.getProperty(BYTE_SEQUENCE).getValue();
+ final ValidationResult result = new HexStringPropertyValidator().validate(BYTE_SEQUENCE.getName(), byteSequence, validationContext);
results.add(result);
}
return results;
@@ -172,13 +167,10 @@ public class SplitContent extends AbstractProcessor {
@OnScheduled
public void initializeByteSequence(final ProcessContext context) throws DecoderException {
- final String bytePattern = context.getProperty(BYTE_SEQUENCE).
- getValue();
+ final String bytePattern = context.getProperty(BYTE_SEQUENCE).getValue();
- final String format = context.getProperty(FORMAT).
- getValue();
- if (HEX_FORMAT.getValue().
- equals(format)) {
+ final String format = context.getProperty(FORMAT).getValue();
+ if (HEX_FORMAT.getValue().equals(format)) {
this.byteSequence.set(Hex.decodeHex(bytePattern.toCharArray()));
} else {
this.byteSequence.set(bytePattern.getBytes(StandardCharsets.UTF_8));
@@ -193,14 +185,11 @@ public class SplitContent extends AbstractProcessor {
}
final ProcessorLog logger = getLogger();
- final boolean keepSequence = context.getProperty(KEEP_SEQUENCE).
- asBoolean();
+ final boolean keepSequence = context.getProperty(KEEP_SEQUENCE).asBoolean();
final boolean keepTrailingSequence;
final boolean keepLeadingSequence;
if (keepSequence) {
- if (context.getProperty(BYTE_SEQUENCE_LOCATION).
- getValue().
- equals(TRAILING_POSITION.getValue())) {
+ if (context.getProperty(BYTE_SEQUENCE_LOCATION).getValue().equals(TRAILING_POSITION.getValue())) {
keepTrailingSequence = true;
keepLeadingSequence = false;
} else {
@@ -214,8 +203,7 @@ public class SplitContent extends AbstractProcessor {
final byte[] byteSequence = this.byteSequence.get();
if (byteSequence == null) { // should never happen. But just in case...
- logger.
- error("{} Unable to obtain Byte Sequence", new Object[]{this});
+ logger.error("{} Unable to obtain Byte Sequence", new Object[]{this});
session.rollback();
return;
}
@@ -292,8 +280,7 @@ public class SplitContent extends AbstractProcessor {
finalSplitOffset += byteSequence.length;
}
if (finalSplitOffset > -1L && finalSplitOffset < flowFile.getSize()) {
- FlowFile finalSplit = session.
- clone(flowFile, finalSplitOffset, flowFile.getSize() - finalSplitOffset);
+ FlowFile finalSplit = session.clone(flowFile, finalSplitOffset, flowFile.getSize() - finalSplitOffset);
splitList.add(finalSplit);
}
@@ -302,13 +289,9 @@ public class SplitContent extends AbstractProcessor {
session.transfer(flowFile, REL_ORIGINAL);
if (splitList.size() > 10) {
- logger.
- info("Split {} into {} files", new Object[]{flowFile, splitList.
- size()});
+ logger.info("Split {} into {} files", new Object[]{flowFile, splitList.size()});
} else {
- logger.
- info("Split {} into {} files: {}", new Object[]{flowFile, splitList.
- size(), splitList});
+ logger.info("Split {} into {} files: {}", new Object[]{flowFile, splitList.size(), splitList});
}
}
@@ -323,8 +306,7 @@ public class SplitContent extends AbstractProcessor {
final String originalFilename = source.
getAttribute(CoreAttributes.FILENAME.key());
- final String fragmentId = UUID.randomUUID().
- toString();
+ final String fragmentId = UUID.randomUUID().toString();
final ArrayList<FlowFile> newList = new ArrayList<>(splits);
splits.clear();
for (int i = 1; i <= newList.size(); i++) {
@@ -345,16 +327,9 @@ public class SplitContent extends AbstractProcessor {
public ValidationResult validate(final String subject, final String input, final ValidationContext validationContext) {
try {
Hex.decodeHex(input.toCharArray());
- return new ValidationResult.Builder().valid(true).
- input(input).
- subject(subject).
- build();
+ return new ValidationResult.Builder().valid(true).input(input).subject(subject).build();
} catch (final Exception e) {
- return new ValidationResult.Builder().valid(false).
- explanation("Not a valid Hex String").
- input(input).
- subject(subject).
- build();
+ return new ValidationResult.Builder().valid(false).explanation("Not a valid Hex String").input(input).subject(subject).build();
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
index 2ffebd5..ef7a86a 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
@@ -59,28 +59,27 @@ import java.util.concurrent.atomic.AtomicReference;
+ "does not evaluate to an array element, the original file is routed to 'failure' and no files are generated.")
public class SplitJson extends AbstractJsonPathProcessor {
- public static final PropertyDescriptor ARRAY_JSON_PATH_EXPRESSION = new PropertyDescriptor.Builder().
- name("JsonPath Expression").
- description("A JsonPath expression that indicates the array element to split into JSON/scalar fragments.").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR) // Full validation/caching occurs in #customValidate
- .
- required(true).
- build();
-
- public static final Relationship REL_ORIGINAL = new Relationship.Builder().
- name("original").
- description("The original FlowFile that was split into segments. If the FlowFile fails processing, nothing will be sent to "
- + "this relationship").
- build();
- public static final Relationship REL_SPLIT = new Relationship.Builder().
- name("split").
- description("All segments of the original FlowFile will be routed to this relationship").
- build();
- public static final Relationship REL_FAILURE = new Relationship.Builder().
- name("failure").
- description("If a FlowFile fails processing for any reason (for example, the FlowFile is not valid JSON or the specified "
- + "path does not exist), it will be routed to this relationship").
- build();
+ public static final PropertyDescriptor ARRAY_JSON_PATH_EXPRESSION = new PropertyDescriptor.Builder()
+ .name("JsonPath Expression")
+ .description("A JsonPath expression that indicates the array element to split into JSON/scalar fragments.")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) // Full validation/caching occurs in #customValidate
+ .required(true)
+ .build();
+
+ public static final Relationship REL_ORIGINAL = new Relationship.Builder()
+ .name("original")
+ .description("The original FlowFile that was split into segments. If the FlowFile fails processing, nothing will be sent to "
+ + "this relationship")
+ .build();
+ public static final Relationship REL_SPLIT = new Relationship.Builder()
+ .name("split")
+ .description("All segments of the original FlowFile will be routed to this relationship")
+ .build();
+ public static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("If a FlowFile fails processing for any reason (for example, the FlowFile is not valid JSON or the specified "
+ + "path does not exist), it will be routed to this relationship")
+ .build();
private List<PropertyDescriptor> properties;
private Set<Relationship> relationships;
@@ -137,10 +136,8 @@ public class SplitJson extends AbstractJsonPathProcessor {
}
};
- String value = validationContext.getProperty(ARRAY_JSON_PATH_EXPRESSION).
- getValue();
- return Collections.singleton(validator.
- validate(ARRAY_JSON_PATH_EXPRESSION.getName(), value, validationContext));
+ String value = validationContext.getProperty(ARRAY_JSON_PATH_EXPRESSION).getValue();
+ return Collections.singleton(validator.validate(ARRAY_JSON_PATH_EXPRESSION.getName(), value, validationContext));
}
@Override
@@ -156,18 +153,14 @@ public class SplitJson extends AbstractJsonPathProcessor {
try {
documentContext = validateAndEstablishJsonContext(processSession, original);
} catch (InvalidJsonException e) {
- logger.
- error("FlowFile {} did not have valid JSON content.", new Object[]{original});
+ logger.error("FlowFile {} did not have valid JSON content.", new Object[]{original});
processSession.transfer(original, REL_FAILURE);
return;
}
final JsonPath jsonPath = JSON_PATH_REF.get();
- String representationOption = processContext.
- getProperty(NULL_VALUE_DEFAULT_REPRESENTATION).
- getValue();
- final String nullDefaultValue = NULL_REPRESENTATION_MAP.
- get(representationOption);
+ String representationOption = processContext.getProperty(NULL_VALUE_DEFAULT_REPRESENTATION).getValue();
+ final String nullDefaultValue = NULL_REPRESENTATION_MAP.get(representationOption);
final List<FlowFile> segments = new ArrayList<>();
@@ -175,17 +168,13 @@ public class SplitJson extends AbstractJsonPathProcessor {
try {
jsonPathResult = documentContext.read(jsonPath);
} catch (PathNotFoundException e) {
- logger.
- warn("JsonPath {} could not be found for FlowFile {}", new Object[]{jsonPath.
- getPath(), original});
+ logger.warn("JsonPath {} could not be found for FlowFile {}", new Object[]{jsonPath.getPath(), original});
processSession.transfer(original, REL_FAILURE);
return;
}
if (!(jsonPathResult instanceof List)) {
- logger.
- error("The evaluated value {} of {} was not a JSON Array compatible type and cannot be split.",
- new Object[]{jsonPathResult, jsonPath.getPath()});
+ logger.error("The evaluated value {} of {} was not a JSON Array compatible type and cannot be split.", new Object[]{jsonPathResult, jsonPath.getPath()});
processSession.transfer(original, REL_FAILURE);
return;
}
@@ -198,20 +187,16 @@ public class SplitJson extends AbstractJsonPathProcessor {
@Override
public void process(OutputStream out) throws IOException {
String resultSegmentContent = getResultRepresentation(resultSegment, nullDefaultValue);
- out.write(resultSegmentContent.
- getBytes(StandardCharsets.UTF_8));
+ out.write(resultSegmentContent.getBytes(StandardCharsets.UTF_8));
}
});
segments.add(split);
}
- processSession.getProvenanceReporter().
- fork(original, segments);
+ processSession.getProvenanceReporter().fork(original, segments);
processSession.transfer(segments, REL_SPLIT);
processSession.transfer(original, REL_ORIGINAL);
- logger.
- info("Split {} into {} FlowFiles", new Object[]{original, segments.
- size()});
+ logger.info("Split {} into {} FlowFiles", new Object[]{original, segments.size()});
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
index f68ef4e..d641274 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
@@ -77,41 +77,40 @@ public class SplitText extends AbstractProcessor {
public static final String FRAGMENT_COUNT = "fragment.count";
public static final String SEGMENT_ORIGINAL_FILENAME = "segment.original.filename";
- public static final PropertyDescriptor LINE_SPLIT_COUNT = new PropertyDescriptor.Builder().
- name("Line Split Count").
- description("The number of lines that will be added to each split file").
- required(true).
- addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR).
- build();
- public static final PropertyDescriptor HEADER_LINE_COUNT = new PropertyDescriptor.Builder().
- name("Header Line Count").
- description("The number of lines that should be considered part of the header; the header lines will be duplicated to all split files").
- required(true).
- addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR).
- defaultValue("0").
- build();
- public static final PropertyDescriptor REMOVE_TRAILING_NEWLINES = new PropertyDescriptor.Builder().
- name("Remove Trailing Newlines").
- description(
- "Whether to remove newlines at the end of each split file. This should be false if you intend to merge the split files later").
- required(true).
- addValidator(StandardValidators.BOOLEAN_VALIDATOR).
- allowableValues("true", "false").
- defaultValue("true").
- build();
-
- public static final Relationship REL_ORIGINAL = new Relationship.Builder().
- name("original").
- description("The original input file will be routed to this destination when it has been successfully split into 1 or more files").
- build();
- public static final Relationship REL_SPLITS = new Relationship.Builder().
- name("splits").
- description("The split files will be routed to this destination when an input file is successfully split into 1 or more split files").
- build();
- public static final Relationship REL_FAILURE = new Relationship.Builder().
- name("failure").
- description("If a file cannot be split for some reason, the original file will be routed to this destination and nothing will be routed elsewhere").
- build();
+ public static final PropertyDescriptor LINE_SPLIT_COUNT = new PropertyDescriptor.Builder()
+ .name("Line Split Count")
+ .description("The number of lines that will be added to each split file")
+ .required(true)
+ .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor HEADER_LINE_COUNT = new PropertyDescriptor.Builder()
+ .name("Header Line Count")
+ .description("The number of lines that should be considered part of the header; the header lines will be duplicated to all split files")
+ .required(true)
+ .addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR)
+ .defaultValue("0")
+ .build();
+ public static final PropertyDescriptor REMOVE_TRAILING_NEWLINES = new PropertyDescriptor.Builder()
+ .name("Remove Trailing Newlines")
+ .description("Whether to remove newlines at the end of each split file. This should be false if you intend to merge the split files later")
+ .required(true)
+ .addValidator(StandardValidators.BOOLEAN_VALIDATOR)
+ .allowableValues("true", "false")
+ .defaultValue("true")
+ .build();
+
+ public static final Relationship REL_ORIGINAL = new Relationship.Builder()
+ .name("original")
+ .description("The original input file will be routed to this destination when it has been successfully split into 1 or more files")
+ .build();
+ public static final Relationship REL_SPLITS = new Relationship.Builder()
+ .name("splits")
+ .description("The split files will be routed to this destination when an input file is successfully split into 1 or more split files")
+ .build();
+ public static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("If a file cannot be split for some reason, the original file will be routed to this destination and nothing will be routed elsewhere")
+ .build();
private List<PropertyDescriptor> properties;
private Set<Relationship> relationships;
@@ -235,13 +234,9 @@ public class SplitText extends AbstractProcessor {
}
final ProcessorLog logger = getLogger();
- final int headerCount = context.getProperty(HEADER_LINE_COUNT).
- asInteger();
- final int splitCount = context.getProperty(LINE_SPLIT_COUNT).
- asInteger();
- final boolean removeTrailingNewlines = context.
- getProperty(REMOVE_TRAILING_NEWLINES).
- asBoolean();
+ final int headerCount = context.getProperty(HEADER_LINE_COUNT).asInteger();
+ final int splitCount = context.getProperty(LINE_SPLIT_COUNT).asInteger();
+ final boolean removeTrailingNewlines = context.getProperty(REMOVE_TRAILING_NEWLINES).asBoolean();
final ObjectHolder<String> errorMessage = new ObjectHolder<>(null);
final ArrayList<SplitInfo> splitInfos = new ArrayList<>();
@@ -258,8 +253,7 @@ public class SplitText extends AbstractProcessor {
final ByteArrayOutputStream headerStream = new ByteArrayOutputStream();
final int headerLinesCopied = readLines(in, headerCount, headerStream, true);
if (headerLinesCopied < headerCount) {
- errorMessage.
- set("Header Line Count is set to " + headerCount + " but file had only " + headerLinesCopied + " lines");
+ errorMessage.set("Header Line Count is set to " + headerCount + " but file had only " + headerLinesCopied + " lines");
return;
}
@@ -270,23 +264,17 @@ public class SplitText extends AbstractProcessor {
final IntegerHolder linesCopied = new IntegerHolder(0);
FlowFile splitFile = session.create(flowFile);
try {
- splitFile = session.
- write(splitFile, new OutputStreamCallback() {
- @Override
- public void process(final OutputStream rawOut) throws IOException {
- try (final BufferedOutputStream out = new BufferedOutputStream(rawOut)) {
- headerStream.writeTo(out);
- linesCopied.
- set(readLines(in, splitCount, out, !removeTrailingNewlines));
- }
- }
- });
- splitFile = session.
- putAttribute(splitFile, SPLIT_LINE_COUNT, String.
- valueOf(linesCopied.get()));
- logger.
- debug("Created Split File {} with {} lines", new Object[]{splitFile, linesCopied.
- get()});
+ splitFile = session.write(splitFile, new OutputStreamCallback() {
+ @Override
+ public void process(final OutputStream rawOut) throws IOException {
+ try (final BufferedOutputStream out = new BufferedOutputStream(rawOut)) {
+ headerStream.writeTo(out);
+ linesCopied.set(readLines(in, splitCount, out, !removeTrailingNewlines));
+ }
+ }
+ });
+ splitFile = session.putAttribute(splitFile, SPLIT_LINE_COUNT, String.valueOf(linesCopied.get()));
+ logger.debug("Created Split File {} with {} lines", new Object[]{splitFile, linesCopied.get()});
} finally {
if (linesCopied.get() > 0) {
splits.add(splitFile);
@@ -313,11 +301,10 @@ public class SplitText extends AbstractProcessor {
info.offsetBytes = beforeReadingLines;
splitInfos.add(info);
final long procNanos = System.nanoTime() - startNanos;
- final long procMillis = TimeUnit.MILLISECONDS.
- convert(procNanos, TimeUnit.NANOSECONDS);
- logger.
- debug("Detected start of Split File in {} at byte offset {} with a length of {} bytes; total splits = {}; total processing time = {} ms", new Object[]{flowFile, beforeReadingLines, info.lengthBytes, splitInfos.
- size(), procMillis});
+ final long procMillis = TimeUnit.MILLISECONDS.convert(procNanos, TimeUnit.NANOSECONDS);
+ logger.debug("Detected start of Split File in {} at byte offset {} with a length of {} bytes; "
+ + "total splits = {}; total processing time = {} ms",
+ new Object[]{flowFile, beforeReadingLines, info.lengthBytes, splitInfos.size(), procMillis});
}
}
}
@@ -326,9 +313,7 @@ public class SplitText extends AbstractProcessor {
});
if (errorMessage.get() != null) {
- logger.
- error("Unable to split {} due to {}; routing to failure", new Object[]{flowFile, errorMessage.
- get()});
+ logger.error("Unable to split {} due to {}; routing to failure", new Object[]{flowFile, errorMessage.get()});
session.transfer(flowFile, REL_FAILURE);
if (splits != null && !splits.isEmpty()) {
session.remove(splits);
@@ -339,22 +324,17 @@ public class SplitText extends AbstractProcessor {
if (!splitInfos.isEmpty()) {
// Create the splits
for (final SplitInfo info : splitInfos) {
- FlowFile split = session.
- clone(flowFile, info.offsetBytes, info.lengthBytes);
- split = session.putAttribute(split, SPLIT_LINE_COUNT, String.
- valueOf(info.lengthLines));
+ FlowFile split = session.clone(flowFile, info.offsetBytes, info.lengthBytes);
+ split = session.putAttribute(split, SPLIT_LINE_COUNT, String.valueOf(info.lengthLines));
splits.add(split);
}
}
finishFragmentAttributes(session, flowFile, splits);
if (splits.size() > 10) {
- logger.info("Split {} into {} files", new Object[]{flowFile, splits.
- size()});
+ logger.info("Split {} into {} files", new Object[]{flowFile, splits.size()});
} else {
- logger.
- info("Split {} into {} files: {}", new Object[]{flowFile, splits.
- size(), splits});
+ logger.info("Split {} into {} files: {}", new Object[]{flowFile, splits.size(), splits});
}
session.transfer(flowFile, REL_ORIGINAL);
@@ -369,11 +349,9 @@ public class SplitText extends AbstractProcessor {
* @param unpacked
*/
private void finishFragmentAttributes(final ProcessSession session, final FlowFile source, final List<FlowFile> splits) {
- final String originalFilename = source.
- getAttribute(CoreAttributes.FILENAME.key());
+ final String originalFilename = source.getAttribute(CoreAttributes.FILENAME.key());
- final String fragmentId = UUID.randomUUID().
- toString();
+ final String fragmentId = UUID.randomUUID().toString();
final ArrayList<FlowFile> newList = new ArrayList<>(splits);
splits.clear();
for (int i = 1; i <= newList.size(); i++) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java
index 8e80e91..adbfff2 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java
@@ -66,26 +66,26 @@ import org.xml.sax.XMLReader;
@CapabilityDescription("Splits an XML File into multiple separate FlowFiles, each comprising a child or descendant of the original root element")
public class SplitXml extends AbstractProcessor {
- public static final PropertyDescriptor SPLIT_DEPTH = new PropertyDescriptor.Builder().
- name("Split Depth").
- description("Indicates the XML-nesting depth to start splitting XML fragments. A depth of 1 means split the root's children, whereas a depth of 2 means split the root's children's children and so forth.").
- required(true).
- addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR).
- defaultValue("1").
- build();
-
- public static final Relationship REL_ORIGINAL = new Relationship.Builder().
- name("original").
- description("The original FlowFile that was split into segments. If the FlowFile fails processing, nothing will be sent to this relationship").
- build();
- public static final Relationship REL_SPLIT = new Relationship.Builder().
- name("split").
- description("All segments of the original FlowFile will be routed to this relationship").
- build();
- public static final Relationship REL_FAILURE = new Relationship.Builder().
- name("failure").
- description("If a FlowFile fails processing for any reason (for example, the FlowFile is not valid XML), it will be routed to this relationship").
- build();
+ public static final PropertyDescriptor SPLIT_DEPTH = new PropertyDescriptor.Builder()
+ .name("Split Depth")
+ .description("Indicates the XML-nesting depth to start splitting XML fragments. A depth of 1 means split the root's children, whereas a depth of 2 means split the root's children's children and so forth.")
+ .required(true)
+ .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
+ .defaultValue("1")
+ .build();
+
+ public static final Relationship REL_ORIGINAL = new Relationship.Builder()
+ .name("original")
+ .description("The original FlowFile that was split into segments. If the FlowFile fails processing, nothing will be sent to this relationship")
+ .build();
+ public static final Relationship REL_SPLIT = new Relationship.Builder()
+ .name("split")
+ .description("All segments of the original FlowFile will be routed to this relationship")
+ .build();
+ public static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("If a FlowFile fails processing for any reason (for example, the FlowFile is not valid XML), it will be routed to this relationship")
+ .build();
private List<PropertyDescriptor> properties;
private Set<Relationship> relationships;
@@ -93,8 +93,7 @@ public class SplitXml extends AbstractProcessor {
private static final String FEATURE_PREFIX = "http://xml.org/sax/features/";
public static final String ENABLE_NAMESPACES_FEATURE = FEATURE_PREFIX + "namespaces";
public static final String ENABLE_NAMESPACE_PREFIXES_FEATURE = FEATURE_PREFIX + "namespace-prefixes";
- private static final SAXParserFactory saxParserFactory = SAXParserFactory.
- newInstance();
+ private static final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
static {
saxParserFactory.setNamespaceAware(true);
@@ -103,8 +102,7 @@ public class SplitXml extends AbstractProcessor {
saxParserFactory.setFeature(ENABLE_NAMESPACE_PREFIXES_FEATURE, true);
} catch (Exception e) {
final Logger staticLogger = LoggerFactory.getLogger(SplitXml.class);
- staticLogger.
- warn("Unable to configure SAX Parser to make namespaces available", e);
+ staticLogger.warn("Unable to configure SAX Parser to make namespaces available", e);
}
}
@@ -138,8 +136,7 @@ public class SplitXml extends AbstractProcessor {
return;
}
- final int depth = context.getProperty(SPLIT_DEPTH).
- asInteger();
+ final int depth = context.getProperty(SPLIT_DEPTH).asInteger();
final ProcessorLog logger = getLogger();
final List<FlowFile> splits = new ArrayList<>();
@@ -169,8 +166,7 @@ public class SplitXml extends AbstractProcessor {
reader.setContentHandler(parser);
reader.parse(new InputSource(in));
} catch (final ParserConfigurationException | SAXException e) {
- logger.
- error("Unable to parse {} due to {}", new Object[]{original, e});
+ logger.error("Unable to parse {} due to {}", new Object[]{original, e});
failed.set(true);
}
}
@@ -183,9 +179,7 @@ public class SplitXml extends AbstractProcessor {
} else {
session.transfer(splits, REL_SPLIT);
session.transfer(original, REL_ORIGINAL);
- logger.
- info("Split {} into {} FlowFiles", new Object[]{original, splits.
- size()});
+ logger.info("Split {} into {} FlowFiles", new Object[]{original, splits.size()});
}
}
@@ -247,9 +241,7 @@ public class SplitXml extends AbstractProcessor {
// if we're at a level where we care about capturing text, then add the closing element
if (newDepth >= splitDepth) {
// Add the element end tag.
- sb.append("</").
- append(qName).
- append(">");
+ sb.append("</").append(qName).append(">");
}
// If we have now returned to level 1, we have finished processing
@@ -301,14 +293,8 @@ public class SplitXml extends AbstractProcessor {
int attCount = atts.getLength();
for (int i = 0; i < attCount; i++) {
String attName = atts.getQName(i);
- String attValue = StringEscapeUtils.escapeXml10(atts.
- getValue(i));
- sb.append(" ").
- append(attName).
- append("=").
- append("\"").
- append(attValue).
- append("\"");
+ String attValue = StringEscapeUtils.escapeXml10(atts.getValue(i));
+ sb.append(" ").append(attName).append("=").append("\"").append(attValue).append("\"");
}
sb.append(">");
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
index 3451516..2abf4a1 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
@@ -69,21 +69,21 @@ import org.apache.nifi.util.Tuple;
description = "These XSLT parameters are passed to the transformer")
public class TransformXml extends AbstractProcessor {
- public static final PropertyDescriptor XSLT_FILE_NAME = new PropertyDescriptor.Builder().
- name("XSLT file name").
- description("Provides the name (including full path) of the XSLT file to apply to the flowfile XML content.").
- required(true).
- addValidator(StandardValidators.FILE_EXISTS_VALIDATOR).
- build();
-
- public static final Relationship REL_SUCCESS = new Relationship.Builder().
- name("success").
- description("The FlowFile with transformed content will be routed to this relationship").
- build();
- public static final Relationship REL_FAILURE = new Relationship.Builder().
- name("failure").
- description("If a FlowFile fails processing for any reason (for example, the FlowFile is not valid XML), it will be routed to this relationship").
- build();
+ public static final PropertyDescriptor XSLT_FILE_NAME = new PropertyDescriptor.Builder()
+ .name("XSLT file name")
+ .description("Provides the name (including full path) of the XSLT file to apply to the flowfile XML content.")
+ .required(true)
+ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .build();
+
+ public static final Relationship REL_SUCCESS = new Relationship.Builder()
+ .name("success")
+ .description("The FlowFile with transformed content will be routed to this relationship")
+ .build();
+ public static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("If a FlowFile fails processing for any reason (for example, the FlowFile is not valid XML), it will be routed to this relationship")
+ .build();
private List<PropertyDescriptor> properties;
private Set<Relationship> relationships;
@@ -113,13 +113,12 @@ public class TransformXml extends AbstractProcessor {
@Override
protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String propertyDescriptorName) {
return new PropertyDescriptor.Builder()
- .name(propertyDescriptorName).
- expressionLanguageSupported(true).
- addValidator(StandardValidators.
- createAttributeExpressionLanguageValidator(AttributeExpression.ResultType.STRING, true)).
- required(false).
- dynamic(true).
- build();
+ .name(propertyDescriptorName)
+ .expressionLanguageSupported(true)
+ .addValidator(StandardValidators.createAttributeExpressionLanguageValidator(AttributeExpression.ResultType.STRING, true))
+ .required(false)
+ .dynamic(true)
+ .build();
}
@Override
@@ -139,26 +138,17 @@ public class TransformXml extends AbstractProcessor {
public void process(final InputStream rawIn, final OutputStream out) throws IOException {
try (final InputStream in = new BufferedInputStream(rawIn)) {
- File stylesheet = new File(context.
- getProperty(XSLT_FILE_NAME).
- getValue());
+ File stylesheet = new File(context.getProperty(XSLT_FILE_NAME).getValue());
StreamSource styleSource = new StreamSource(stylesheet);
TransformerFactory tfactory = new net.sf.saxon.TransformerFactoryImpl();
- Transformer transformer = tfactory.
- newTransformer(styleSource);
+ Transformer transformer = tfactory.newTransformer(styleSource);
// pass all dynamic properties to the transformer
- for (final Map.Entry<PropertyDescriptor, String> entry : context.
- getProperties().
+ for (final Map.Entry<PropertyDescriptor, String> entry : context.getProperties().
entrySet()) {
- if (entry.getKey().
- isDynamic()) {
- String value = context.
- newPropertyValue(entry.getValue()).
- evaluateAttributeExpressions(original).
- getValue();
- transformer.setParameter(entry.getKey().
- getName(), value);
+ if (entry.getKey().isDynamic()) {
+ String value = context.newPropertyValue(entry.getValue()).evaluateAttributeExpressions(original).getValue();
+ transformer.setParameter(entry.getKey().getName(), value);
}
}
@@ -172,13 +162,10 @@ public class TransformXml extends AbstractProcessor {
}
});
session.transfer(transformed, REL_SUCCESS);
- session.getProvenanceReporter().
- modifyContent(transformed, stopWatch.
- getElapsed(TimeUnit.MILLISECONDS));
+ session.getProvenanceReporter().modifyContent(transformed, stopWatch.getElapsed(TimeUnit.MILLISECONDS));
logger.info("Transformed {}", new Object[]{original});
} catch (ProcessException e) {
- logger.
- error("Unable to transform {} due to {}", new Object[]{original, e});
+ logger.error("Unable to transform {} due to {}", new Object[]{original, e});
session.transfer(original, REL_FAILURE);
}
}
@@ -191,8 +178,7 @@ public class TransformXml extends AbstractProcessor {
@Override
public ValidationResult validate(final String subject, final String input, final ValidationContext validationContext) {
final Tuple<String, ValidationResult> lastResult = this.cachedResult;
- if (lastResult != null && lastResult.getKey().
- equals(input)) {
+ if (lastResult != null && lastResult.getKey().equals(input)) {
return lastResult.getValue();
} else {
String error = null;
@@ -206,13 +192,12 @@ public class TransformXml extends AbstractProcessor {
error = e.toString();
}
- this.cachedResult = new Tuple<>(input,
- new ValidationResult.Builder()
- .input(input).
- subject(subject).
- valid(error == null).
- explanation(error).
- build());
+ this.cachedResult = new Tuple<>(input, new ValidationResult.Builder()
+ .input(input)
+ .subject(subject)
+ .valid(error == null)
+ .explanation(error)
+ .build());
return this.cachedResult.getValue();
}
}
[11/12] incubator-nifi git commit: NIFI-271
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java
index b37471e..65bbb36 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutJMS.java
@@ -96,14 +96,14 @@ public class PutJMS extends AbstractProcessor {
public static final Charset UTF8 = Charset.forName("UTF-8");
public static final int DEFAULT_MESSAGE_PRIORITY = 4;
- public static final Relationship REL_SUCCESS = new Relationship.Builder().
- name("success").
- description("All FlowFiles that are sent to the JMS destination are routed to this relationship").
- build();
- public static final Relationship REL_FAILURE = new Relationship.Builder().
- name("failure").
- description("All FlowFiles that cannot be routed to the JMS destination are routed to this relationship").
- build();
+ public static final Relationship REL_SUCCESS = new Relationship.Builder()
+ .name("success")
+ .description("All FlowFiles that are sent to the JMS destination are routed to this relationship")
+ .build();
+ public static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("All FlowFiles that cannot be routed to the JMS destination are routed to this relationship")
+ .build();
private final Queue<WrappedMessageProducer> producerQueue = new LinkedBlockingQueue<>();
private final List<PropertyDescriptor> properties;
@@ -156,10 +156,7 @@ public class PutJMS extends AbstractProcessor {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
final ProcessorLog logger = getLogger();
- final List<FlowFile> flowFiles = session.get(context.
- getProperty(BATCH_SIZE).
- asInteger().
- intValue());
+ final List<FlowFile> flowFiles = session.get(context.getProperty(BATCH_SIZE).asInteger().intValue());
if (flowFiles.isEmpty()) {
return;
}
@@ -167,14 +164,10 @@ public class PutJMS extends AbstractProcessor {
WrappedMessageProducer wrappedProducer = producerQueue.poll();
if (wrappedProducer == null) {
try {
- wrappedProducer = JmsFactory.
- createMessageProducer(context, true);
- logger.info("Connected to JMS server {}", new Object[]{context.
- getProperty(URL).
- getValue()});
+ wrappedProducer = JmsFactory.createMessageProducer(context, true);
+ logger.info("Connected to JMS server {}", new Object[]{context.getProperty(URL).getValue()});
} catch (final JMSException e) {
- logger.
- error("Failed to connect to JMS Server due to {}", new Object[]{e});
+ logger.error("Failed to connect to JMS Server due to {}", new Object[]{e});
session.transfer(flowFiles, REL_FAILURE);
context.yield();
return;
@@ -184,9 +177,7 @@ public class PutJMS extends AbstractProcessor {
final Session jmsSession = wrappedProducer.getSession();
final MessageProducer producer = wrappedProducer.getProducer();
- final int maxBufferSize = context.getProperty(MAX_BUFFER_SIZE).
- asDataSize(DataUnit.B).
- intValue();
+ final int maxBufferSize = context.getProperty(MAX_BUFFER_SIZE).asDataSize(DataUnit.B).intValue();
try {
final Set<FlowFile> successfulFlowFiles = new HashSet<>();
@@ -194,8 +185,7 @@ public class PutJMS extends AbstractProcessor {
for (FlowFile flowFile : flowFiles) {
if (flowFile.getSize() > maxBufferSize) {
session.transfer(flowFile, REL_FAILURE);
- logger.
- warn("Routing {} to failure because its size exceeds the configured max", new Object[]{flowFile});
+ logger.warn("Routing {} to failure because its size exceeds the configured max", new Object[]{flowFile});
continue;
}
@@ -208,29 +198,18 @@ public class PutJMS extends AbstractProcessor {
}
});
- final Long ttl = context.getProperty(MESSAGE_TTL).
- asTimePeriod(TimeUnit.MILLISECONDS);
+ final Long ttl = context.getProperty(MESSAGE_TTL).asTimePeriod(TimeUnit.MILLISECONDS);
- final String replyToQueueName = context.
- getProperty(REPLY_TO_QUEUE).
- evaluateAttributeExpressions(flowFile).
- getValue();
- final Destination replyToQueue = replyToQueueName == null ? null : JmsFactory.
- createQueue(context, replyToQueueName);
+ final String replyToQueueName = context.getProperty(REPLY_TO_QUEUE).evaluateAttributeExpressions(flowFile).getValue();
+ final Destination replyToQueue = replyToQueueName == null ? null : JmsFactory.createQueue(context, replyToQueueName);
int priority = DEFAULT_MESSAGE_PRIORITY;
try {
- final Integer priorityInt = context.
- getProperty(MESSAGE_PRIORITY).
- evaluateAttributeExpressions(flowFile).
- asInteger();
+ final Integer priorityInt = context.getProperty(MESSAGE_PRIORITY).evaluateAttributeExpressions(flowFile).asInteger();
priority = priorityInt == null ? priority : priorityInt;
} catch (final NumberFormatException e) {
- logger.
- warn("Invalid value for JMS Message Priority: {}; defaulting to priority of {}", new Object[]{
- context.getProperty(MESSAGE_PRIORITY).
- evaluateAttributeExpressions(flowFile).
- getValue(), DEFAULT_MESSAGE_PRIORITY});
+ logger.warn("Invalid value for JMS Message Priority: {}; defaulting to priority of {}",
+ new Object[]{context.getProperty(MESSAGE_PRIORITY).evaluateAttributeExpressions(flowFile).getValue(), DEFAULT_MESSAGE_PRIORITY});
}
try {
@@ -242,16 +221,14 @@ public class PutJMS extends AbstractProcessor {
}
producer.send(message);
} catch (final JMSException e) {
- logger.
- error("Failed to send {} to JMS Server due to {}", new Object[]{flowFile, e});
+ logger.error("Failed to send {} to JMS Server due to {}", new Object[]{flowFile, e});
session.transfer(flowFiles, REL_FAILURE);
context.yield();
try {
jmsSession.rollback();
} catch (final JMSException jmse) {
- logger.
- warn("Unable to roll back JMS Session due to {}", new Object[]{jmse});
+ logger.warn("Unable to roll back JMS Session due to {}", new Object[]{jmse});
}
wrappedProducer.close(logger);
@@ -259,22 +236,17 @@ public class PutJMS extends AbstractProcessor {
}
successfulFlowFiles.add(flowFile);
- session.getProvenanceReporter().
- send(flowFile, "jms://" + context.getProperty(URL).
- getValue());
+ session.getProvenanceReporter().send(flowFile, "jms://" + context.getProperty(URL).getValue());
}
try {
jmsSession.commit();
session.transfer(successfulFlowFiles, REL_SUCCESS);
- final String flowFileDescription = successfulFlowFiles.size() > 10 ? successfulFlowFiles.
- size() + " FlowFiles" : successfulFlowFiles.toString();
- logger.
- info("Sent {} to JMS Server and transferred to 'success'", new Object[]{flowFileDescription});
+ final String flowFileDescription = successfulFlowFiles.size() > 10 ? successfulFlowFiles.size() + " FlowFiles" : successfulFlowFiles.toString();
+ logger.info("Sent {} to JMS Server and transferred to 'success'", new Object[]{flowFileDescription});
} catch (JMSException e) {
- logger.
- error("Failed to commit JMS Session due to {}; rolling back session", new Object[]{e});
+ logger.error("Failed to commit JMS Session due to {}; rolling back session", new Object[]{e});
session.rollback();
wrappedProducer.close(logger);
}
@@ -289,22 +261,19 @@ public class PutJMS extends AbstractProcessor {
final FlowFile flowFile, final Destination replyToQueue, final Integer priority) throws JMSException {
final Message message;
- switch (context.getProperty(MESSAGE_TYPE).
- getValue()) {
+ switch (context.getProperty(MESSAGE_TYPE).getValue()) {
case MSG_TYPE_EMPTY: {
message = jmsSession.createTextMessage("");
break;
}
case MSG_TYPE_STREAM: {
- final StreamMessage streamMessage = jmsSession.
- createStreamMessage();
+ final StreamMessage streamMessage = jmsSession.createStreamMessage();
streamMessage.writeBytes(messageContent);
message = streamMessage;
break;
}
case MSG_TYPE_TEXT: {
- message = jmsSession.
- createTextMessage(new String(messageContent, UTF8));
+ message = jmsSession.createTextMessage(new String(messageContent, UTF8));
break;
}
case MSG_TYPE_MAP: {
@@ -313,8 +282,7 @@ public class PutJMS extends AbstractProcessor {
}
case MSG_TYPE_BYTE:
default: {
- final BytesMessage bytesMessage = jmsSession.
- createBytesMessage();
+ final BytesMessage bytesMessage = jmsSession.createBytesMessage();
bytesMessage.writeBytes(messageContent);
message = bytesMessage;
}
@@ -330,8 +298,7 @@ public class PutJMS extends AbstractProcessor {
message.setJMSPriority(priority);
}
- if (context.getProperty(ATTRIBUTES_TO_JMS_PROPS).
- asBoolean()) {
+ if (context.getProperty(ATTRIBUTES_TO_JMS_PROPS).asBoolean()) {
copyAttributesToJmsProps(flowFile, message);
}
@@ -339,35 +306,25 @@ public class PutJMS extends AbstractProcessor {
}
/**
- * Iterates through all of the flow file's metadata and for any metadata key
- * that starts with <code>jms.</code>, the value for the corresponding key
- * is written to the JMS message as a property. The name of this property is
- * equal to the key of the flow file's metadata minus the <code>jms.</code>.
- * For example, if the flowFile has a metadata entry:
+ * Iterates through all of the flow file's metadata and for any metadata key that starts with <code>jms.</code>, the value for the corresponding key is written to the JMS message as a property.
+ * The name of this property is equal to the key of the flow file's metadata minus the <code>jms.</code>. For example, if the flowFile has a metadata entry:
* <br /><br />
* <code>jms.count</code> = <code>8</code>
* <br /><br />
- * then the JMS message will have a String property added to it with the
- * property name <code>count</code> and value <code>8</code>.
+ * then the JMS message will have a String property added to it with the property name <code>count</code> and value <code>8</code>.
*
- * If the flow file also has a metadata key with the name
- * <code>jms.count.type</code>, then the value of that metadata entry will
- * determine the JMS property type to use for the value. For example, if the
- * flow file has the following properties:
+ * If the flow file also has a metadata key with the name <code>jms.count.type</code>, then the value of that metadata entry will determine the JMS property type to use for the value. For example,
+ * if the flow file has the following properties:
* <br /><br />
* <code>jms.count</code> = <code>8</code><br />
* <code>jms.count.type</code> = <code>integer</code>
* <br /><br />
- * Then <code>message</code> will have an INTEGER property added with the
- * value 8.
+ * Then <code>message</code> will have an INTEGER property added with the value 8.
* <br /><br/>
- * If the type is not valid for the given value (e.g.,
- * <code>jms.count.type</code> = <code>integer</code> and
- * <code>jms.count</code> = <code>hello</code>, then this JMS property will
- * not be added to <code>message</code>.
+ * If the type is not valid for the given value (e.g., <code>jms.count.type</code> = <code>integer</code> and <code>jms.count</code> = <code>hello</code>, then this JMS property will not be added
+ * to <code>message</code>.
*
- * @param flowFile The flow file whose metadata should be examined for JMS
- * properties.
+ * @param flowFile The flow file whose metadata should be examined for JMS properties.
* @param message The JMS message to which we want to add properties.
* @throws JMSException ex
*/
@@ -380,49 +337,37 @@ public class PutJMS extends AbstractProcessor {
final String value = entry.getValue();
if (key.toLowerCase().
- startsWith(ATTRIBUTE_PREFIX.toLowerCase())
- && !key.toLowerCase().
- endsWith(ATTRIBUTE_TYPE_SUFFIX.toLowerCase())) {
+ startsWith(ATTRIBUTE_PREFIX.toLowerCase()) && !key.toLowerCase().endsWith(ATTRIBUTE_TYPE_SUFFIX.toLowerCase())) {
- final String jmsPropName = key.substring(ATTRIBUTE_PREFIX.
- length());
+ final String jmsPropName = key.substring(ATTRIBUTE_PREFIX.length());
final String type = attributes.get(key + ATTRIBUTE_TYPE_SUFFIX);
try {
if (type == null || type.equalsIgnoreCase(PROP_TYPE_STRING)) {
message.setStringProperty(jmsPropName, value);
} else if (type.equalsIgnoreCase(PROP_TYPE_INTEGER)) {
- message.setIntProperty(jmsPropName, Integer.
- parseInt(value));
+ message.setIntProperty(jmsPropName, Integer.parseInt(value));
} else if (type.equalsIgnoreCase(PROP_TYPE_BOOLEAN)) {
- message.setBooleanProperty(jmsPropName, Boolean.
- parseBoolean(value));
+ message.setBooleanProperty(jmsPropName, Boolean.parseBoolean(value));
} else if (type.equalsIgnoreCase(PROP_TYPE_SHORT)) {
- message.setShortProperty(jmsPropName, Short.
- parseShort(value));
+ message.setShortProperty(jmsPropName, Short.parseShort(value));
} else if (type.equalsIgnoreCase(PROP_TYPE_LONG)) {
- message.setLongProperty(jmsPropName, Long.
- parseLong(value));
+ message.setLongProperty(jmsPropName, Long.parseLong(value));
} else if (type.equalsIgnoreCase(PROP_TYPE_BYTE)) {
- message.setByteProperty(jmsPropName, Byte.
- parseByte(value));
+ message.setByteProperty(jmsPropName, Byte.parseByte(value));
} else if (type.equalsIgnoreCase(PROP_TYPE_DOUBLE)) {
- message.setDoubleProperty(jmsPropName, Double.
- parseDouble(value));
+ message.setDoubleProperty(jmsPropName, Double.parseDouble(value));
} else if (type.equalsIgnoreCase(PROP_TYPE_FLOAT)) {
- message.setFloatProperty(jmsPropName, Float.
- parseFloat(value));
+ message.setFloatProperty(jmsPropName, Float.parseFloat(value));
} else if (type.equalsIgnoreCase(PROP_TYPE_OBJECT)) {
message.setObjectProperty(jmsPropName, value);
} else {
- logger.
- warn("Attribute key '{}' for {} has value '{}', but expected one of: integer, string, object, byte, double, float, long, short, boolean; not adding this property",
- new Object[]{key, flowFile, value});
+ logger.warn("Attribute key '{}' for {} has value '{}', but expected one of: integer, string, object, byte, double, float, long, short, boolean; not adding this property",
+ new Object[]{key, flowFile, value});
}
} catch (NumberFormatException e) {
- logger.
- warn("Attribute key '{}' for {} has value '{}', but attribute key '{}' has value '{}'. Not adding this JMS property",
- new Object[]{key, flowFile, value, key + ATTRIBUTE_TYPE_SUFFIX, PROP_TYPE_INTEGER});
+ logger.warn("Attribute key '{}' for {} has value '{}', but attribute key '{}' has value '{}'. Not adding this JMS property",
+ new Object[]{key, flowFile, value, key + ATTRIBUTE_TYPE_SUFFIX, PROP_TYPE_INTEGER});
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
index d061c33..acabe08 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java
@@ -67,54 +67,53 @@ public class ReplaceText extends AbstractProcessor {
private final Pattern backReferencePattern = Pattern.compile("\\$(\\d+)");
private static final byte[] ZERO_BYTE_BUFFER = new byte[0];
// Properties
- public static final PropertyDescriptor REGEX = new PropertyDescriptor.Builder().
- name("Regular Expression").
- description("The Regular Expression to search for in the FlowFile content").
- required(true).
- addValidator(StandardValidators.
- createRegexValidator(0, Integer.MAX_VALUE, true)).
- expressionLanguageSupported(true).
- defaultValue("(.*)").
- build();
- public static final PropertyDescriptor REPLACEMENT_VALUE = new PropertyDescriptor.Builder().
- name("Replacement Value").
- description("The value to replace the regular expression with. Back-references to Regular Expression capturing groups are supported, but back-references that reference capturing groups that do not exist in the regular expression will be treated as literal value.").
- required(true).
- defaultValue("$1").
- addValidator(Validator.VALID).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor CHARACTER_SET = new PropertyDescriptor.Builder().
- name("Character Set").
- description("The Character Set in which the file is encoded").
- required(true).
- addValidator(StandardValidators.CHARACTER_SET_VALIDATOR).
- defaultValue("UTF-8").
- build();
- public static final PropertyDescriptor MAX_BUFFER_SIZE = new PropertyDescriptor.Builder().
- name("Maximum Buffer Size").
- description("Specifies the maximum amount of data to buffer (per file or per line, depending on the Evaluation Mode) in order to apply the regular expressions. If 'Entire Text' (in Evaluation Mode) is selected and the FlowFile is larger than this value, the FlowFile will be routed to 'failure'. "
- + "In 'Line-by-Line' Mode, if a single line is larger than this value, the FlowFile will be routed to 'failure'. A default value of 1 MB is provided, primarily for 'Entire Text' mode. In 'Line-by-Line' Mode, a value such as 8 KB or 16 KB is suggested. This value is ignored and the buffer is not used if 'Regular Expression' is set to '.*'").
- required(true).
- addValidator(StandardValidators.DATA_SIZE_VALIDATOR).
- defaultValue("1 MB").
- build();
- public static final PropertyDescriptor EVALUATION_MODE = new PropertyDescriptor.Builder().
- name("Evaluation Mode").
- description("Evaluate the 'Regular Expression' against each line (Line-by-Line) or buffer the entire file into memory (Entire Text) and then evaluate the 'Regular Expression'.").
- allowableValues(LINE_BY_LINE, ENTIRE_TEXT).
- defaultValue(ENTIRE_TEXT).
- required(true).
- build();
+ public static final PropertyDescriptor REGEX = new PropertyDescriptor.Builder()
+ .name("Regular Expression")
+ .description("The Regular Expression to search for in the FlowFile content")
+ .required(true)
+ .addValidator(StandardValidators.createRegexValidator(0, Integer.MAX_VALUE, true))
+ .expressionLanguageSupported(true)
+ .defaultValue("(.*)")
+ .build();
+ public static final PropertyDescriptor REPLACEMENT_VALUE = new PropertyDescriptor.Builder()
+ .name("Replacement Value")
+ .description("The value to replace the regular expression with. Back-references to Regular Expression capturing groups are supported, but back-references that reference capturing groups that do not exist in the regular expression will be treated as literal value.")
+ .required(true)
+ .defaultValue("$1")
+ .addValidator(Validator.VALID)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor CHARACTER_SET = new PropertyDescriptor.Builder()
+ .name("Character Set")
+ .description("The Character Set in which the file is encoded")
+ .required(true)
+ .addValidator(StandardValidators.CHARACTER_SET_VALIDATOR)
+ .defaultValue("UTF-8")
+ .build();
+ public static final PropertyDescriptor MAX_BUFFER_SIZE = new PropertyDescriptor.Builder()
+ .name("Maximum Buffer Size")
+ .description("Specifies the maximum amount of data to buffer (per file or per line, depending on the Evaluation Mode) in order to apply the regular expressions. If 'Entire Text' (in Evaluation Mode) is selected and the FlowFile is larger than this value, the FlowFile will be routed to 'failure'. "
+ + "In 'Line-by-Line' Mode, if a single line is larger than this value, the FlowFile will be routed to 'failure'. A default value of 1 MB is provided, primarily for 'Entire Text' mode. In 'Line-by-Line' Mode, a value such as 8 KB or 16 KB is suggested. This value is ignored and the buffer is not used if 'Regular Expression' is set to '.*'")
+ .required(true)
+ .addValidator(StandardValidators.DATA_SIZE_VALIDATOR)
+ .defaultValue("1 MB")
+ .build();
+ public static final PropertyDescriptor EVALUATION_MODE = new PropertyDescriptor.Builder()
+ .name("Evaluation Mode")
+ .description("Evaluate the 'Regular Expression' against each line (Line-by-Line) or buffer the entire file into memory (Entire Text) and then evaluate the 'Regular Expression'.")
+ .allowableValues(LINE_BY_LINE, ENTIRE_TEXT)
+ .defaultValue(ENTIRE_TEXT)
+ .required(true)
+ .build();
// Relationships
- public static final Relationship REL_SUCCESS = new Relationship.Builder().
- name("success").
- description("FlowFiles that have been successfully updated are routed to this relationship, as well as FlowFiles whose content does not match the given Regular Expression").
- build();
- public static final Relationship REL_FAILURE = new Relationship.Builder().
- name("failure").
- description("FlowFiles that could not be updated are routed to this relationship").
- build();
+ public static final Relationship REL_SUCCESS = new Relationship.Builder()
+ .name("success")
+ .description("FlowFiles that have been successfully updated are routed to this relationship, as well as FlowFiles whose content does not match the given Regular Expression")
+ .build();
+ public static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("FlowFiles that could not be updated are routed to this relationship")
+ .build();
//
private List<PropertyDescriptor> properties;
private Set<Relationship> relationships;
@@ -147,19 +146,15 @@ public class ReplaceText extends AbstractProcessor {
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException {
- final List<FlowFile> flowFiles = session.get(FlowFileFilters.
- newSizeBasedFilter(1, DataUnit.MB, 100));
+ final List<FlowFile> flowFiles = session.get(FlowFileFilters.newSizeBasedFilter(1, DataUnit.MB, 100));
if (flowFiles.isEmpty()) {
return;
}
final ProcessorLog logger = getLogger();
- final String unsubstitutedRegex = context.getProperty(REGEX).
- getValue();
- String unsubstitutedReplacement = context.getProperty(REPLACEMENT_VALUE).
- getValue();
- if (unsubstitutedRegex.equals("(.*)") && unsubstitutedReplacement.
- equals("$1")) {
+ final String unsubstitutedRegex = context.getProperty(REGEX).getValue();
+ String unsubstitutedReplacement = context.getProperty(REPLACEMENT_VALUE).getValue();
+ if (unsubstitutedRegex.equals("(.*)") && unsubstitutedReplacement.equals("$1")) {
// This pattern says replace content with itself. We can highly optimize this process by simply transferring
// all FlowFiles to the 'success' relationship
session.transfer(flowFiles, REL_SUCCESS);
@@ -180,26 +175,17 @@ public class ReplaceText extends AbstractProcessor {
}
};
- final String regexValue = context.getProperty(REGEX).
- evaluateAttributeExpressions().
- getValue();
- final int numCapturingGroups = Pattern.compile(regexValue).
- matcher("").
- groupCount();
+ final String regexValue = context.getProperty(REGEX).evaluateAttributeExpressions().getValue();
+ final int numCapturingGroups = Pattern.compile(regexValue).matcher("").groupCount();
final boolean skipBuffer = ".*".equals(unsubstitutedRegex);
- final Charset charset = Charset.forName(context.
- getProperty(CHARACTER_SET).
- getValue());
- final int maxBufferSize = context.getProperty(MAX_BUFFER_SIZE).
- asDataSize(DataUnit.B).
- intValue();
+ final Charset charset = Charset.forName(context.getProperty(CHARACTER_SET).getValue());
+ final int maxBufferSize = context.getProperty(MAX_BUFFER_SIZE).asDataSize(DataUnit.B).intValue();
final byte[] buffer = skipBuffer ? ZERO_BYTE_BUFFER : new byte[maxBufferSize];
- final String evaluateMode = context.getProperty(EVALUATION_MODE).
- getValue();
+ final String evaluateMode = context.getProperty(EVALUATION_MODE).getValue();
for (FlowFile flowFile : flowFiles) {
if (evaluateMode.equalsIgnoreCase(ENTIRE_TEXT)) {
@@ -209,11 +195,8 @@ public class ReplaceText extends AbstractProcessor {
}
}
- String replacement = context.getProperty(REPLACEMENT_VALUE).
- evaluateAttributeExpressions(flowFile, escapeBackRefDecorator).
- getValue();
- final Matcher backRefMatcher = backReferencePattern.
- matcher(replacement);
+ String replacement = context.getProperty(REPLACEMENT_VALUE).evaluateAttributeExpressions(flowFile, escapeBackRefDecorator).getValue();
+ final Matcher backRefMatcher = backReferencePattern.matcher(replacement);
while (backRefMatcher.find()) {
final String backRefNum = backRefMatcher.group(1);
if (backRefNum.startsWith("0")) {
@@ -231,8 +214,7 @@ public class ReplaceText extends AbstractProcessor {
}
if (backRefIndex > numCapturingGroups) {
- final StringBuilder sb = new StringBuilder(replacement.
- length() + 1);
+ final StringBuilder sb = new StringBuilder(replacement.length() + 1);
final int groupStart = backRefMatcher.start(1);
sb.append(replacement.substring(0, groupStart - 1));
@@ -250,14 +232,12 @@ public class ReplaceText extends AbstractProcessor {
if (skipBuffer) {
final StopWatch stopWatch = new StopWatch(true);
if (evaluateMode.equalsIgnoreCase(ENTIRE_TEXT)) {
- flowFile = session.
- write(flowFile, new OutputStreamCallback() {
- @Override
- public void process(final OutputStream out) throws IOException {
- out.
- write(replacementValue.getBytes(charset));
- }
- });
+ flowFile = session.write(flowFile, new OutputStreamCallback() {
+ @Override
+ public void process(final OutputStream out) throws IOException {
+ out.write(replacementValue.getBytes(charset));
+ }
+ });
} else {
flowFile = session.write(flowFile, new StreamCallback() {
@Override
@@ -271,19 +251,14 @@ public class ReplaceText extends AbstractProcessor {
}
});
}
- session.getProvenanceReporter().
- modifyContent(flowFile, stopWatch.
- getElapsed(TimeUnit.MILLISECONDS));
+ session.getProvenanceReporter().modifyContent(flowFile, stopWatch.getElapsed(TimeUnit.MILLISECONDS));
session.transfer(flowFile, REL_SUCCESS);
- logger.
- info("Transferred {} to 'success'", new Object[]{flowFile});
+ logger.info("Transferred {} to 'success'", new Object[]{flowFile});
continue;
}
final StopWatch stopWatch = new StopWatch(true);
- final String regex = context.getProperty(REGEX).
- evaluateAttributeExpressions(flowFile, quotedAttributeDecorator).
- getValue();
+ final String regex = context.getProperty(REGEX).evaluateAttributeExpressions(flowFile, quotedAttributeDecorator).getValue();
if (evaluateMode.equalsIgnoreCase(ENTIRE_TEXT)) {
final int flowFileSize = (int) flowFile.getSize();
@@ -292,8 +267,7 @@ public class ReplaceText extends AbstractProcessor {
public void process(final InputStream in, final OutputStream out) throws IOException {
StreamUtils.fillBuffer(in, buffer, false);
final String contentString = new String(buffer, 0, flowFileSize, charset);
- final String updatedValue = contentString.
- replaceAll(regex, replacementValue);
+ final String updatedValue = contentString.replaceAll(regex, replacementValue);
out.write(updatedValue.getBytes(charset));
}
});
@@ -305,8 +279,7 @@ public class ReplaceText extends AbstractProcessor {
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(out, charset));) {
String oneLine;
while (null != (oneLine = br.readLine())) {
- final String updatedValue = oneLine.
- replaceAll(regex, replacementValue);
+ final String updatedValue = oneLine.replaceAll(regex, replacementValue);
bw.write(updatedValue);
}
}
@@ -315,9 +288,7 @@ public class ReplaceText extends AbstractProcessor {
}
logger.info("Transferred {} to 'success'", new Object[]{flowFile});
- session.getProvenanceReporter().
- modifyContent(flowFile, stopWatch.
- getElapsed(TimeUnit.MILLISECONDS));
+ session.getProvenanceReporter().modifyContent(flowFile, stopWatch.getElapsed(TimeUnit.MILLISECONDS));
session.transfer(flowFile, REL_SUCCESS);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
index a8a2919..5be2b69 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java
@@ -71,62 +71,60 @@ import org.apache.commons.lang3.StringUtils;
@CapabilityDescription("Updates the content of a FlowFile by evaluating a Regular Expression against it and replacing the section of the content that matches the Regular Expression with some alternate value provided in a mapping file.")
public class ReplaceTextWithMapping extends AbstractProcessor {
- public static final PropertyDescriptor REGEX = new PropertyDescriptor.Builder().
- name("Regular Expression").
- description("The Regular Expression to search for in the FlowFile content").
- required(true).
- addValidator(StandardValidators.
- createRegexValidator(0, Integer.MAX_VALUE, true)).
- expressionLanguageSupported(true).
- defaultValue("\\S+").
- build();
- public static final PropertyDescriptor MATCHING_GROUP_FOR_LOOKUP_KEY = new PropertyDescriptor.Builder().
- name("Matching Group").
- description("The number of the matching group of the provided regex to replace with the corresponding value from the mapping file (if it exists).").
- addValidator(StandardValidators.INTEGER_VALIDATOR).
- required(true).
- expressionLanguageSupported(true).
- defaultValue("0").
- build();
- public static final PropertyDescriptor MAPPING_FILE = new PropertyDescriptor.Builder().
- name("Mapping File").
- description("The name of the file (including the full path) containing the Mappings.").
- addValidator(StandardValidators.FILE_EXISTS_VALIDATOR).
- required(true).
- build();
- public static final PropertyDescriptor MAPPING_FILE_REFRESH_INTERVAL = new PropertyDescriptor.Builder().
- name("Mapping File Refresh Interval").
- description("The polling interval in seconds to check for updates to the mapping file. The default is 60s.").
- addValidator(StandardValidators.TIME_PERIOD_VALIDATOR).
- required(true).
- defaultValue("60s").
- build();
- public static final PropertyDescriptor CHARACTER_SET = new PropertyDescriptor.Builder().
- name("Character Set").
- description("The Character Set in which the file is encoded").
- required(true).
- addValidator(StandardValidators.CHARACTER_SET_VALIDATOR).
- defaultValue("UTF-8").
- build();
- public static final PropertyDescriptor MAX_BUFFER_SIZE = new PropertyDescriptor.Builder().
- name("Maximum Buffer Size").
- description("Specifies the maximum amount of data to buffer (per file) in order to apply the regular expressions. If a FlowFile is larger than this value, the FlowFile will be routed to 'failure'").
- required(true).
- addValidator(StandardValidators.DATA_SIZE_VALIDATOR).
- defaultValue("1 MB").
- build();
-
- public static final Relationship REL_SUCCESS = new Relationship.Builder().
- name("success").
- description("FlowFiles that have been successfully updated are routed to this relationship, as well as FlowFiles whose content does not match the given Regular Expression").
- build();
- public static final Relationship REL_FAILURE = new Relationship.Builder().
- name("failure").
- description("FlowFiles that could not be updated are routed to this relationship").
- build();
-
- private final Pattern backReferencePattern = Pattern.
- compile("[^\\\\]\\$(\\d+)");
+ public static final PropertyDescriptor REGEX = new PropertyDescriptor.Builder()
+ .name("Regular Expression")
+ .description("The Regular Expression to search for in the FlowFile content")
+ .required(true)
+ .addValidator(StandardValidators.createRegexValidator(0, Integer.MAX_VALUE, true))
+ .expressionLanguageSupported(true)
+ .defaultValue("\\S+")
+ .build();
+ public static final PropertyDescriptor MATCHING_GROUP_FOR_LOOKUP_KEY = new PropertyDescriptor.Builder()
+ .name("Matching Group")
+ .description("The number of the matching group of the provided regex to replace with the corresponding value from the mapping file (if it exists).")
+ .addValidator(StandardValidators.INTEGER_VALIDATOR)
+ .required(true)
+ .expressionLanguageSupported(true)
+ .defaultValue("0")
+ .build();
+ public static final PropertyDescriptor MAPPING_FILE = new PropertyDescriptor.Builder()
+ .name("Mapping File")
+ .description("The name of the file (including the full path) containing the Mappings.")
+ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
+ .required(true)
+ .build();
+ public static final PropertyDescriptor MAPPING_FILE_REFRESH_INTERVAL = new PropertyDescriptor.Builder()
+ .name("Mapping File Refresh Interval")
+ .description("The polling interval in seconds to check for updates to the mapping file. The default is 60s.")
+ .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
+ .required(true)
+ .defaultValue("60s")
+ .build();
+ public static final PropertyDescriptor CHARACTER_SET = new PropertyDescriptor.Builder()
+ .name("Character Set")
+ .description("The Character Set in which the file is encoded")
+ .required(true)
+ .addValidator(StandardValidators.CHARACTER_SET_VALIDATOR)
+ .defaultValue("UTF-8")
+ .build();
+ public static final PropertyDescriptor MAX_BUFFER_SIZE = new PropertyDescriptor.Builder()
+ .name("Maximum Buffer Size")
+ .description("Specifies the maximum amount of data to buffer (per file) in order to apply the regular expressions. If a FlowFile is larger than this value, the FlowFile will be routed to 'failure'")
+ .required(true)
+ .addValidator(StandardValidators.DATA_SIZE_VALIDATOR)
+ .defaultValue("1 MB")
+ .build();
+
+ public static final Relationship REL_SUCCESS = new Relationship.Builder()
+ .name("success")
+ .description("FlowFiles that have been successfully updated are routed to this relationship, as well as FlowFiles whose content does not match the given Regular Expression")
+ .build();
+ public static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("FlowFiles that could not be updated are routed to this relationship")
+ .build();
+
+ private final Pattern backReferencePattern = Pattern.compile("[^\\\\]\\$(\\d+)");
private List<PropertyDescriptor> properties;
private Set<Relationship> relationships;
@@ -134,31 +132,23 @@ public class ReplaceTextWithMapping extends AbstractProcessor {
private final ReentrantLock processorLock = new ReentrantLock();
private final AtomicLong lastModified = new AtomicLong(0L);
final AtomicLong mappingTestTime = new AtomicLong(0);
- private final AtomicReference<ConfigurationState> configurationStateRef = new AtomicReference<>(
- new ConfigurationState(null));
+ private final AtomicReference<ConfigurationState> configurationStateRef = new AtomicReference<>(new ConfigurationState(null));
@Override
protected Collection<ValidationResult> customValidate(final ValidationContext context) {
- final List<ValidationResult> errors = new ArrayList<>(super.
- customValidate(context));
-
- final String regexValue = context.getProperty(REGEX).
- evaluateAttributeExpressions().
- getValue();
- final int numCapturingGroups = Pattern.compile(regexValue).
- matcher("").
- groupCount();
- final int groupToMatch = context.
- getProperty(MATCHING_GROUP_FOR_LOOKUP_KEY).
- evaluateAttributeExpressions().
- asInteger();
+ final List<ValidationResult> errors = new ArrayList<>(super.customValidate(context));
+
+ final String regexValue = context.getProperty(REGEX).evaluateAttributeExpressions().getValue();
+ final int numCapturingGroups = Pattern.compile(regexValue).matcher("").groupCount();
+ final int groupToMatch = context.getProperty(MATCHING_GROUP_FOR_LOOKUP_KEY).evaluateAttributeExpressions().asInteger();
if (groupToMatch > numCapturingGroups) {
- errors.add(new ValidationResult.Builder().
- subject("Insufficient Matching Groups").
- valid(false).
- explanation("The specified matching group does not exist for the regular expression provided").
- build());
+ errors.add(
+ new ValidationResult.Builder()
+ .subject("Insufficient Matching Groups")
+ .valid(false)
+ .explanation("The specified matching group does not exist for the regular expression provided")
+ .build());
}
return errors;
}
@@ -200,9 +190,7 @@ public class ReplaceTextWithMapping extends AbstractProcessor {
final ProcessorLog logger = getLogger();
- final int maxBufferSize = context.getProperty(MAX_BUFFER_SIZE).
- asDataSize(DataUnit.B).
- intValue();
+ final int maxBufferSize = context.getProperty(MAX_BUFFER_SIZE).asDataSize(DataUnit.B).intValue();
for (FlowFile flowFile : flowFiles) {
if (flowFile.getSize() > maxBufferSize) {
@@ -212,13 +200,10 @@ public class ReplaceTextWithMapping extends AbstractProcessor {
final StopWatch stopWatch = new StopWatch(true);
- flowFile = session.
- write(flowFile, new ReplaceTextCallback(context, flowFile, maxBufferSize));
+ flowFile = session.write(flowFile, new ReplaceTextCallback(context, flowFile, maxBufferSize));
logger.info("Transferred {} to 'success'", new Object[]{flowFile});
- session.getProvenanceReporter().
- modifyContent(flowFile, stopWatch.
- getElapsed(TimeUnit.MILLISECONDS));
+ session.getProvenanceReporter().modifyContent(flowFile, stopWatch.getElapsed(TimeUnit.MILLISECONDS));
session.transfer(flowFile, REL_SUCCESS);
}
}
@@ -252,42 +237,33 @@ public class ReplaceTextWithMapping extends AbstractProcessor {
// if not queried mapping file lastUpdate time in
// mapppingRefreshPeriodSecs, do so.
long currentTimeSecs = System.currentTimeMillis() / 1000;
- long mappingRefreshPeriodSecs = context.
- getProperty(MAPPING_FILE_REFRESH_INTERVAL).
- asTimePeriod(TimeUnit.SECONDS);
+ long mappingRefreshPeriodSecs = context.getProperty(MAPPING_FILE_REFRESH_INTERVAL).asTimePeriod(TimeUnit.SECONDS);
boolean retry = (currentTimeSecs > (mappingTestTime.get() + mappingRefreshPeriodSecs));
if (retry) {
mappingTestTime.set(System.currentTimeMillis() / 1000);
// see if the mapping file needs to be reloaded
- final String fileName = context.getProperty(MAPPING_FILE).
- getValue();
+ final String fileName = context.getProperty(MAPPING_FILE).getValue();
final File file = new File(fileName);
if (file.exists() && file.isFile() && file.canRead()) {
if (file.lastModified() > lastModified.get()) {
lastModified.getAndSet(file.lastModified());
try (FileInputStream is = new FileInputStream(file)) {
- logger.
- info("Reloading mapping file: {}", new Object[]{fileName});
+ logger.info("Reloading mapping file: {}", new Object[]{fileName});
final Map<String, String> mapping = loadMappingFile(is);
- final ConfigurationState newState = new ConfigurationState(
- mapping);
+ final ConfigurationState newState = new ConfigurationState(mapping);
configurationStateRef.set(newState);
} catch (IOException e) {
- logger.
- error("Error reading mapping file: {}", new Object[]{e.
- getMessage()});
+ logger.error("Error reading mapping file: {}", new Object[]{e.getMessage()});
}
}
} else {
- logger.
- error("Mapping file does not exist or is not readable: {}", new Object[]{fileName});
+ logger.error("Mapping file does not exist or is not readable: {}", new Object[]{fileName});
}
}
} catch (Exception e) {
- logger.error("Error loading mapping file: {}", new Object[]{e.
- getMessage()});
+ logger.error("Error loading mapping file: {}", new Object[]{e.getMessage()});
} finally {
processorLock.unlock();
}
@@ -354,34 +330,23 @@ public class ReplaceTextWithMapping extends AbstractProcessor {
};
private ReplaceTextCallback(ProcessContext context, FlowFile flowFile, int maxBufferSize) {
- this.regex = context.getProperty(REGEX).
- evaluateAttributeExpressions(flowFile, quotedAttributeDecorator).
- getValue();
+ this.regex = context.getProperty(REGEX).evaluateAttributeExpressions(flowFile, quotedAttributeDecorator).getValue();
this.flowFile = flowFile;
- this.charset = Charset.forName(context.getProperty(CHARACTER_SET).
- getValue());
+ this.charset = Charset.forName(context.getProperty(CHARACTER_SET).getValue());
- final String regexValue = context.getProperty(REGEX).
- evaluateAttributeExpressions().
- getValue();
- this.numCapturingGroups = Pattern.compile(regexValue).
- matcher("").
- groupCount();
+ final String regexValue = context.getProperty(REGEX).evaluateAttributeExpressions().getValue();
+ this.numCapturingGroups = Pattern.compile(regexValue).matcher("").groupCount();
this.buffer = new byte[maxBufferSize];
- this.groupToMatch = context.
- getProperty(MATCHING_GROUP_FOR_LOOKUP_KEY).
- evaluateAttributeExpressions().
- asInteger();
+ this.groupToMatch = context.getProperty(MATCHING_GROUP_FOR_LOOKUP_KEY).evaluateAttributeExpressions().asInteger();
}
@Override
public void process(final InputStream in, final OutputStream out) throws IOException {
- final Map<String, String> mapping = configurationStateRef.get().
- getMapping();
+ final Map<String, String> mapping = configurationStateRef.get().getMapping();
StreamUtils.fillBuffer(in, buffer, false);
@@ -389,8 +354,7 @@ public class ReplaceTextWithMapping extends AbstractProcessor {
final String contentString = new String(buffer, 0, flowFileSize, charset);
- final Matcher matcher = Pattern.compile(regex).
- matcher(contentString);
+ final Matcher matcher = Pattern.compile(regex).matcher(contentString);
matcher.reset();
boolean result = matcher.find();
@@ -401,37 +365,26 @@ public class ReplaceTextWithMapping extends AbstractProcessor {
String rv = mapping.get(matched);
if (rv == null) {
- String replacement = matcher.group().
- replace("$", "\\$");
+ String replacement = matcher.group().replace("$", "\\$");
matcher.appendReplacement(sb, replacement);
} else {
String allRegexMatched = matcher.group(); //this is everything that matched the regex
- int scaledStart = matcher.start(groupToMatch) - matcher.
- start();
- int scaledEnd = scaledStart + matcher.
- group(groupToMatch).
- length();
+ int scaledStart = matcher.start(groupToMatch) - matcher.start();
+ int scaledEnd = scaledStart + matcher.group(groupToMatch).length();
StringBuilder replacementBuilder = new StringBuilder();
- replacementBuilder.append(allRegexMatched.
- substring(0, scaledStart).
- replace("$", "\\$"));
- replacementBuilder.
- append(fillReplacementValueBackReferences(rv, numCapturingGroups));
- replacementBuilder.append(allRegexMatched.
- substring(scaledEnd).
- replace("$", "\\$"));
-
- matcher.appendReplacement(sb, replacementBuilder.
- toString());
+ replacementBuilder.append(allRegexMatched.substring(0, scaledStart).replace("$", "\\$"));
+ replacementBuilder.append(fillReplacementValueBackReferences(rv, numCapturingGroups));
+ replacementBuilder.append(allRegexMatched.substring(scaledEnd).replace("$", "\\$"));
+
+ matcher.appendReplacement(sb, replacementBuilder.toString());
}
result = matcher.find();
} while (result);
matcher.appendTail(sb);
- out.write(sb.toString().
- getBytes(charset));
+ out.write(sb.toString().getBytes(charset));
return;
}
out.write(contentString.getBytes(charset));
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
index ff231d7..8b6a7b4 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
@@ -48,16 +48,10 @@ import org.apache.nifi.processor.util.StandardValidators;
/**
* <p>
- * This processor routes a FlowFile based on its flow file attributes by using
- * the Attribute Expression Language. The Expression Language is used by adding
- * Optional Properties to the processor. The name of the Property indicates the
- * name of the relationship to which a FlowFile will be routed if matched. The
- * value of the Property indicates an Attribute Expression Language Expression
- * that will be used to determine whether or not a given FlowFile will be routed
- * to the associated relationship. If multiple expressions match a FlowFile's
- * attributes, that FlowFile will be cloned and routed to each corresponding
- * relationship. If none of the supplied expressions matches for a given
- * FlowFile, that FlowFile will be routed to the 'unmatched' relationship.
+ * This processor routes a FlowFile based on its flow file attributes by using the Attribute Expression Language. The Expression Language is used by adding Optional Properties to the processor. The
+ * name of the Property indicates the name of the relationship to which a FlowFile will be routed if matched. The value of the Property indicates an Attribute Expression Language Expression that will
+ * be used to determine whether or not a given FlowFile will be routed to the associated relationship. If multiple expressions match a FlowFile's attributes, that FlowFile will be cloned and routed to
+ * each corresponding relationship. If none of the supplied expressions matches for a given FlowFile, that FlowFile will be routed to the 'unmatched' relationship.
* </p>
*
* @author unattributed
@@ -79,43 +73,34 @@ public class RouteOnAttribute extends AbstractProcessor {
private static final String routeAnyMatches = "Route to 'match' if any matches";
private static final String routePropertyNameValue = "Route to Property name";
- public static final AllowableValue ROUTE_PROPERTY_NAME = new AllowableValue(
- routePropertyNameValue,
- "Route to Property name",
- "A copy of the FlowFile will be routed to each relationship whose corresponding expression evaluates to 'true'"
- );
- public static final AllowableValue ROUTE_ALL_MATCH = new AllowableValue(
- routeAllMatchValue,
- "Route to 'matched' if all match",
- "Requires that all user-defined expressions evaluate to 'true' for the FlowFile to be considered a match"
- );
- public static final AllowableValue ROUTE_ANY_MATCHES = new AllowableValue(
- routeAnyMatches, // keep the word 'match' instead of 'matched' to maintain backward compatibility (there was a typo originally)
+ public static final AllowableValue ROUTE_PROPERTY_NAME = new AllowableValue(routePropertyNameValue, "Route to Property name",
+ "A copy of the FlowFile will be routed to each relationship whose corresponding expression evaluates to 'true'");
+ public static final AllowableValue ROUTE_ALL_MATCH = new AllowableValue(routeAllMatchValue, "Route to 'matched' if all match",
+ "Requires that all user-defined expressions evaluate to 'true' for the FlowFile to be considered a match");
+ public static final AllowableValue ROUTE_ANY_MATCHES = new AllowableValue(routeAnyMatches, // keep the word 'match' instead of 'matched' to maintain backward compatibility (there was a typo originally)
"Route to 'matched' if any matches",
- "Requires that at least one user-defined expression evaluate to 'true' for hte FlowFile to be considered a match"
- );
+ "Requires that at least one user-defined expression evaluate to 'true' for hte FlowFile to be considered a match");
- public static final PropertyDescriptor ROUTE_STRATEGY = new PropertyDescriptor.Builder().
- name("Routing Strategy").
- description("Specifies how to determine which relationship to use when evaluating the Expression Language").
- required(true).
- allowableValues(ROUTE_PROPERTY_NAME, ROUTE_ALL_MATCH, ROUTE_ANY_MATCHES).
- defaultValue(ROUTE_PROPERTY_NAME.getValue()).
- build();
+ public static final PropertyDescriptor ROUTE_STRATEGY = new PropertyDescriptor.Builder()
+ .name("Routing Strategy")
+ .description("Specifies how to determine which relationship to use when evaluating the Expression Language")
+ .required(true)
+ .allowableValues(ROUTE_PROPERTY_NAME, ROUTE_ALL_MATCH, ROUTE_ANY_MATCHES)
+ .defaultValue(ROUTE_PROPERTY_NAME.getValue())
+ .build();
public static final Relationship REL_NO_MATCH = new Relationship.Builder()
- .name("unmatched").
- description("FlowFiles that do not match any user-define expression will be routed here").
- build();
+ .name("unmatched")
+ .description("FlowFiles that do not match any user-define expression will be routed here")
+ .build();
public static final Relationship REL_MATCH = new Relationship.Builder()
- .name("matched").
- description("FlowFiles will be routed to 'match' if one or all Expressions match, depending on the configuration of the Routing Strategy property").
- build();
+ .name("matched")
+ .description("FlowFiles will be routed to 'match' if one or all Expressions match, depending on the configuration of the Routing Strategy property")
+ .build();
private AtomicReference<Set<Relationship>> relationships = new AtomicReference<>();
private List<PropertyDescriptor> properties;
- private volatile String configuredRouteStrategy = ROUTE_STRATEGY.
- getDefaultValue();
+ private volatile String configuredRouteStrategy = ROUTE_STRATEGY.getDefaultValue();
private volatile Set<String> dynamicPropertyNames = new HashSet<>();
@Override
@@ -142,13 +127,12 @@ public class RouteOnAttribute extends AbstractProcessor {
@Override
protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String propertyDescriptorName) {
return new PropertyDescriptor.Builder()
- .required(false).
- name(propertyDescriptorName).
- addValidator(StandardValidators.
- createAttributeExpressionLanguageValidator(ResultType.BOOLEAN, false)).
- dynamic(true).
- expressionLanguageSupported(true).
- build();
+ .required(false)
+ .name(propertyDescriptorName)
+ .addValidator(StandardValidators.createAttributeExpressionLanguageValidator(ResultType.BOOLEAN, false))
+ .dynamic(true)
+ .expressionLanguageSupported(true)
+ .build();
}
@Override
@@ -163,8 +147,7 @@ public class RouteOnAttribute extends AbstractProcessor {
newDynamicPropertyNames.add(descriptor.getName());
}
- this.dynamicPropertyNames = Collections.
- unmodifiableSet(newDynamicPropertyNames);
+ this.dynamicPropertyNames = Collections.unmodifiableSet(newDynamicPropertyNames);
}
// formulate the new set of Relationships
@@ -173,8 +156,7 @@ public class RouteOnAttribute extends AbstractProcessor {
final String routeStrategy = configuredRouteStrategy;
if (ROUTE_PROPERTY_NAME.equals(routeStrategy)) {
for (final String propName : allDynamicProps) {
- newRelationships.add(new Relationship.Builder().name(propName).
- build());
+ newRelationships.add(new Relationship.Builder().name(propName).build());
}
} else {
newRelationships.add(REL_MATCH);
@@ -193,32 +175,26 @@ public class RouteOnAttribute extends AbstractProcessor {
final ProcessorLog logger = getLogger();
final Map<Relationship, PropertyValue> propertyMap = new HashMap<>();
- for (final PropertyDescriptor descriptor : context.getProperties().
- keySet()) {
+ for (final PropertyDescriptor descriptor : context.getProperties().keySet()) {
if (!descriptor.isDynamic()) {
continue;
}
- propertyMap.put(new Relationship.Builder().
- name(descriptor.getName()).
- build(), context.getProperty(descriptor));
+ propertyMap.put(new Relationship.Builder().name(descriptor.getName()).build(), context.getProperty(descriptor));
}
final Set<Relationship> matchingRelationships = new HashSet<>();
- for (final Map.Entry<Relationship, PropertyValue> entry : propertyMap.
- entrySet()) {
+ for (final Map.Entry<Relationship, PropertyValue> entry : propertyMap.entrySet()) {
final PropertyValue value = entry.getValue();
- final boolean matches = value.evaluateAttributeExpressions(flowFile).
- asBoolean();
+ final boolean matches = value.evaluateAttributeExpressions(flowFile).asBoolean();
if (matches) {
matchingRelationships.add(entry.getKey());
}
}
final Set<Relationship> destinationRelationships = new HashSet<>();
- switch (context.getProperty(ROUTE_STRATEGY).
- getValue()) {
+ switch (context.getProperty(ROUTE_STRATEGY).getValue()) {
case routeAllMatchValue:
if (matchingRelationships.size() == propertyMap.size()) {
destinationRelationships.add(REL_MATCH);
@@ -241,52 +217,36 @@ public class RouteOnAttribute extends AbstractProcessor {
if (destinationRelationships.isEmpty()) {
logger.info(this + " routing " + flowFile + " to unmatched");
- flowFile = session.
- putAttribute(flowFile, ROUTE_ATTRIBUTE_KEY, REL_NO_MATCH.
- getName());
- session.getProvenanceReporter().
- route(flowFile, REL_NO_MATCH);
+ flowFile = session.putAttribute(flowFile, ROUTE_ATTRIBUTE_KEY, REL_NO_MATCH.getName());
+ session.getProvenanceReporter().route(flowFile, REL_NO_MATCH);
session.transfer(flowFile, REL_NO_MATCH);
} else {
- final Iterator<Relationship> relationshipNameIterator = destinationRelationships.
- iterator();
- final Relationship firstRelationship = relationshipNameIterator.
- next();
+ final Iterator<Relationship> relationshipNameIterator = destinationRelationships.iterator();
+ final Relationship firstRelationship = relationshipNameIterator.next();
final Map<Relationship, FlowFile> transferMap = new HashMap<>();
final Set<FlowFile> clones = new HashSet<>();
// make all the clones for any remaining relationships
while (relationshipNameIterator.hasNext()) {
- final Relationship relationship = relationshipNameIterator.
- next();
+ final Relationship relationship = relationshipNameIterator.next();
final FlowFile cloneFlowFile = session.clone(flowFile);
clones.add(cloneFlowFile);
transferMap.put(relationship, cloneFlowFile);
}
// now transfer any clones generated
- for (final Map.Entry<Relationship, FlowFile> entry : transferMap.
- entrySet()) {
- logger.info(this + " cloned " + flowFile + " into " + entry.
- getValue() + " and routing clone to relationship " + entry.
- getKey());
- FlowFile updatedFlowFile = session.
- putAttribute(entry.getValue(), ROUTE_ATTRIBUTE_KEY, entry.
- getKey().
- getName());
- session.getProvenanceReporter().
- route(updatedFlowFile, entry.getKey());
+ for (final Map.Entry<Relationship, FlowFile> entry : transferMap.entrySet()) {
+ logger.info(this + " cloned " + flowFile + " into " + entry.getValue() + " and routing clone to relationship " + entry.getKey());
+ FlowFile updatedFlowFile = session.putAttribute(entry.getValue(), ROUTE_ATTRIBUTE_KEY, entry.getKey().getName());
+ session.getProvenanceReporter().route(updatedFlowFile, entry.getKey());
session.transfer(updatedFlowFile, entry.getKey());
}
//now transfer the original flow file
logger.
info("Routing {} to {}", new Object[]{flowFile, firstRelationship});
- session.getProvenanceReporter().
- route(flowFile, firstRelationship);
- flowFile = session.
- putAttribute(flowFile, ROUTE_ATTRIBUTE_KEY, firstRelationship.
- getName());
+ session.getProvenanceReporter().route(flowFile, firstRelationship);
+ flowFile = session.putAttribute(flowFile, ROUTE_ATTRIBUTE_KEY, firstRelationship.getName());
session.transfer(flowFile, firstRelationship);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java
index 8f1eb4e..937bc69 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java
@@ -70,34 +70,34 @@ public class RouteOnContent extends AbstractProcessor {
public static final String MATCH_ALL = "content must match exactly";
public static final String MATCH_SUBSEQUENCE = "content must contain match";
- public static final PropertyDescriptor BUFFER_SIZE = new PropertyDescriptor.Builder().
- name("Content Buffer Size").
- description("Specifies the maximum amount of data to buffer in order to apply the regular expressions. If the size of the FlowFile "
- + "exceeds this value, any amount of this value will be ignored").
- required(true).
- addValidator(StandardValidators.DATA_SIZE_VALIDATOR).
- defaultValue("1 MB").
- build();
- public static final PropertyDescriptor MATCH_REQUIREMENT = new PropertyDescriptor.Builder().
- name("Match Requirement").
- description("Specifies whether the entire content of the file must match the regular expression exactly, or if any part of the file "
- + "(up to Content Buffer Size) can contain the regular expression in order to be considered a match").
- required(true).
- allowableValues(MATCH_ALL, MATCH_SUBSEQUENCE).
- defaultValue(MATCH_ALL).
- build();
- public static final PropertyDescriptor CHARACTER_SET = new PropertyDescriptor.Builder().
- name("Character Set").
- description("The Character Set in which the file is encoded").
- required(true).
- addValidator(StandardValidators.CHARACTER_SET_VALIDATOR).
- defaultValue("UTF-8").
- build();
-
- public static final Relationship REL_NO_MATCH = new Relationship.Builder().
- name("unmatched").
- description("FlowFiles that do not match any of the user-supplied regular expressions will be routed to this relationship").
- build();
+ public static final PropertyDescriptor BUFFER_SIZE = new PropertyDescriptor.Builder()
+ .name("Content Buffer Size")
+ .description("Specifies the maximum amount of data to buffer in order to apply the regular expressions. If the size of the FlowFile "
+ + "exceeds this value, any amount of this value will be ignored")
+ .required(true)
+ .addValidator(StandardValidators.DATA_SIZE_VALIDATOR)
+ .defaultValue("1 MB")
+ .build();
+ public static final PropertyDescriptor MATCH_REQUIREMENT = new PropertyDescriptor.Builder()
+ .name("Match Requirement")
+ .description("Specifies whether the entire content of the file must match the regular expression exactly, or if any part of the file "
+ + "(up to Content Buffer Size) can contain the regular expression in order to be considered a match")
+ .required(true)
+ .allowableValues(MATCH_ALL, MATCH_SUBSEQUENCE)
+ .defaultValue(MATCH_ALL)
+ .build();
+ public static final PropertyDescriptor CHARACTER_SET = new PropertyDescriptor.Builder()
+ .name("Character Set")
+ .description("The Character Set in which the file is encoded")
+ .required(true)
+ .addValidator(StandardValidators.CHARACTER_SET_VALIDATOR)
+ .defaultValue("UTF-8")
+ .build();
+
+ public static final Relationship REL_NO_MATCH = new Relationship.Builder()
+ .name("unmatched")
+ .description("FlowFiles that do not match any of the user-supplied regular expressions will be routed to this relationship")
+ .build();
private final AtomicReference<Set<Relationship>> relationships = new AtomicReference<>();
private List<PropertyDescriptor> properties;
@@ -132,23 +132,19 @@ public class RouteOnContent extends AbstractProcessor {
}
return new PropertyDescriptor.Builder()
- .required(false).
- name(propertyDescriptorName).
- addValidator(StandardValidators.
- createRegexValidator(0, Integer.MAX_VALUE, true)).
- dynamic(true).
- expressionLanguageSupported(true).
- build();
+ .required(false)
+ .name(propertyDescriptorName)
+ .addValidator(StandardValidators.createRegexValidator(0, Integer.MAX_VALUE, true))
+ .dynamic(true)
+ .expressionLanguageSupported(true)
+ .build();
}
@Override
public void onPropertyModified(final PropertyDescriptor descriptor, final String oldValue, final String newValue) {
if (descriptor.isDynamic()) {
- final Set<Relationship> relationships = new HashSet<>(this.relationships.
- get());
- final Relationship relationship = new Relationship.Builder().
- name(descriptor.getName()).
- build();
+ final Set<Relationship> relationships = new HashSet<>(this.relationships.get());
+ final Relationship relationship = new Relationship.Builder().name(descriptor.getName()).build();
if (newValue == null) {
relationships.remove(relationship);
@@ -170,20 +166,15 @@ public class RouteOnContent extends AbstractProcessor {
final AttributeValueDecorator quoteDecorator = new AttributeValueDecorator() {
@Override
public String decorate(final String attributeValue) {
- return (attributeValue == null) ? null : Pattern.
- quote(attributeValue);
+ return (attributeValue == null) ? null : Pattern.quote(attributeValue);
}
};
final Map<FlowFile, Set<Relationship>> flowFileDestinationMap = new HashMap<>();
final ProcessorLog logger = getLogger();
- final Charset charset = Charset.forName(context.
- getProperty(CHARACTER_SET).
- getValue());
- final byte[] buffer = new byte[context.getProperty(BUFFER_SIZE).
- asDataSize(DataUnit.B).
- intValue()];
+ final Charset charset = Charset.forName(context.getProperty(CHARACTER_SET).getValue());
+ final byte[] buffer = new byte[context.getProperty(BUFFER_SIZE).asDataSize(DataUnit.B).intValue()];
for (final FlowFile flowFile : flowFiles) {
final Set<Relationship> destinations = new HashSet<>();
flowFileDestinationMap.put(flowFile, destinations);
@@ -192,82 +183,58 @@ public class RouteOnContent extends AbstractProcessor {
session.read(flowFile, new InputStreamCallback() {
@Override
public void process(final InputStream in) throws IOException {
- bufferedByteCount.set(StreamUtils.
- fillBuffer(in, buffer, false));
+ bufferedByteCount.set(StreamUtils.fillBuffer(in, buffer, false));
}
});
- final String contentString = new String(buffer, 0, bufferedByteCount.
- get(), charset);
+ final String contentString = new String(buffer, 0, bufferedByteCount.get(), charset);
- for (final PropertyDescriptor descriptor : context.getProperties().
- keySet()) {
+ for (final PropertyDescriptor descriptor : context.getProperties().keySet()) {
if (!descriptor.isDynamic()) {
continue;
}
- final String regex = context.getProperty(descriptor).
- evaluateAttributeExpressions(flowFile, quoteDecorator).
- getValue();
+ final String regex = context.getProperty(descriptor).evaluateAttributeExpressions(flowFile, quoteDecorator).getValue();
final Pattern pattern = Pattern.compile(regex);
final boolean matches;
- if (context.getProperty(MATCH_REQUIREMENT).
- getValue().
- equalsIgnoreCase(MATCH_ALL)) {
- matches = pattern.matcher(contentString).
- matches();
+ if (context.getProperty(MATCH_REQUIREMENT).getValue().equalsIgnoreCase(MATCH_ALL)) {
+ matches = pattern.matcher(contentString).matches();
} else {
- matches = pattern.matcher(contentString).
- find();
+ matches = pattern.matcher(contentString).find();
}
if (matches) {
- final Relationship relationship = new Relationship.Builder().
- name(descriptor.getName()).
- build();
+ final Relationship relationship = new Relationship.Builder().name(descriptor.getName()).build();
destinations.add(relationship);
}
}
}
- for (final Map.Entry<FlowFile, Set<Relationship>> entry : flowFileDestinationMap.
- entrySet()) {
+ for (final Map.Entry<FlowFile, Set<Relationship>> entry : flowFileDestinationMap.entrySet()) {
FlowFile flowFile = entry.getKey();
final Set<Relationship> destinations = entry.getValue();
if (destinations.isEmpty()) {
- flowFile = session.
- putAttribute(flowFile, ROUTE_ATTRIBUTE_KEY, REL_NO_MATCH.
- getName());
+ flowFile = session.putAttribute(flowFile, ROUTE_ATTRIBUTE_KEY, REL_NO_MATCH.getName());
session.transfer(flowFile, REL_NO_MATCH);
- session.getProvenanceReporter().
- route(flowFile, REL_NO_MATCH);
+ session.getProvenanceReporter().route(flowFile, REL_NO_MATCH);
logger.info("Routing {} to 'unmatched'", new Object[]{flowFile});
} else {
- final Relationship firstRelationship = destinations.iterator().
- next();
+ final Relationship firstRelationship = destinations.iterator().next();
destinations.remove(firstRelationship);
for (final Relationship relationship : destinations) {
FlowFile clone = session.clone(flowFile);
- clone = session.
- putAttribute(clone, ROUTE_ATTRIBUTE_KEY, relationship.
- getName());
- session.getProvenanceReporter().
- route(clone, relationship);
+ clone = session.putAttribute(clone, ROUTE_ATTRIBUTE_KEY, relationship.getName());
+ session.getProvenanceReporter().route(clone, relationship);
session.transfer(clone, relationship);
- logger.
- info("Cloning {} to {} and routing clone to {}", new Object[]{flowFile, clone, relationship});
+ logger.info("Cloning {} to {} and routing clone to {}", new Object[]{flowFile, clone, relationship});
}
- flowFile = session.
- putAttribute(flowFile, ROUTE_ATTRIBUTE_KEY, firstRelationship.
- getName());
- session.getProvenanceReporter().
- route(flowFile, firstRelationship);
+ flowFile = session.putAttribute(flowFile, ROUTE_ATTRIBUTE_KEY, firstRelationship.getName());
+ session.getProvenanceReporter().route(flowFile, firstRelationship);
session.transfer(flowFile, firstRelationship);
- logger.
- info("Routing {} to {}", new Object[]{flowFile, firstRelationship});
+ logger.info("Routing {} to {}", new Object[]{flowFile, firstRelationship});
}
}
}
[06/12] incubator-nifi git commit: NIFI-271
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
index f5fea2c..699db39 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java
@@ -30,133 +30,100 @@ public class TestCompressContent {
@Test
public void testBzip2DecompressConcatenated() throws Exception {
- final TestRunner runner = TestRunners.
- newTestRunner(CompressContent.class);
+ final TestRunner runner = TestRunners.newTestRunner(CompressContent.class);
runner.setProperty(CompressContent.MODE, "decompress");
runner.setProperty(CompressContent.COMPRESSION_FORMAT, "bzip2");
runner.setProperty(CompressContent.UPDATE_FILENAME, "false");
- runner.enqueue(Paths.
- get("src/test/resources/CompressedData/SampleFileConcat.txt.bz2"));
+ runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFileConcat.txt.bz2"));
runner.run();
runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1);
- MockFlowFile flowFile = runner.
- getFlowFilesForRelationship(CompressContent.REL_SUCCESS).
- get(0);
- flowFile.assertContentEquals(Paths.
- get("src/test/resources/CompressedData/SampleFileConcat.txt"));
+ MockFlowFile flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0);
+ flowFile.assertContentEquals(Paths.get("src/test/resources/CompressedData/SampleFileConcat.txt"));
flowFile.assertAttributeEquals("filename", "SampleFileConcat.txt.bz2"); // not updating filename
}
@Test
public void testBzip2Decompress() throws Exception {
- final TestRunner runner = TestRunners.
- newTestRunner(CompressContent.class);
+ final TestRunner runner = TestRunners.newTestRunner(CompressContent.class);
runner.setProperty(CompressContent.MODE, "decompress");
runner.setProperty(CompressContent.COMPRESSION_FORMAT, "bzip2");
runner.setProperty(CompressContent.UPDATE_FILENAME, "true");
- runner.enqueue(Paths.
- get("src/test/resources/CompressedData/SampleFile.txt.bz2"));
+ runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFile.txt.bz2"));
runner.run();
runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1);
- MockFlowFile flowFile = runner.
- getFlowFilesForRelationship(CompressContent.REL_SUCCESS).
- get(0);
- flowFile.assertContentEquals(Paths.
- get("src/test/resources/CompressedData/SampleFile.txt"));
+ MockFlowFile flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0);
+ flowFile.assertContentEquals(Paths.get("src/test/resources/CompressedData/SampleFile.txt"));
flowFile.assertAttributeEquals("filename", "SampleFile.txt");
runner.clearTransferState();
- runner.enqueue(Paths.
- get("src/test/resources/CompressedData/SampleFile1.txt.bz2"));
+ runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFile1.txt.bz2"));
runner.run();
runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1);
- flowFile = runner.
- getFlowFilesForRelationship(CompressContent.REL_SUCCESS).
- get(0);
- flowFile.assertContentEquals(Paths.
- get("src/test/resources/CompressedData/SampleFile.txt"));
+ flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0);
+ flowFile.assertContentEquals(Paths.get("src/test/resources/CompressedData/SampleFile.txt"));
flowFile.assertAttributeEquals("filename", "SampleFile1.txt");
}
@Test
public void testGzipDecompress() throws Exception {
- final TestRunner runner = TestRunners.
- newTestRunner(CompressContent.class);
+ final TestRunner runner = TestRunners.newTestRunner(CompressContent.class);
runner.setProperty(CompressContent.MODE, "decompress");
runner.setProperty(CompressContent.COMPRESSION_FORMAT, "gzip");
- assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true").
- isValid());
+ assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true").isValid());
- runner.enqueue(Paths.
- get("src/test/resources/CompressedData/SampleFile.txt.gz"));
+ runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFile.txt.gz"));
runner.run();
runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1);
- MockFlowFile flowFile = runner.
- getFlowFilesForRelationship(CompressContent.REL_SUCCESS).
- get(0);
- flowFile.assertContentEquals(Paths.
- get("src/test/resources/CompressedData/SampleFile.txt"));
+ MockFlowFile flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0);
+ flowFile.assertContentEquals(Paths.get("src/test/resources/CompressedData/SampleFile.txt"));
flowFile.assertAttributeEquals("filename", "SampleFile.txt");
runner.clearTransferState();
- runner.enqueue(Paths.
- get("src/test/resources/CompressedData/SampleFile1.txt.gz"));
+ runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFile1.txt.gz"));
runner.run();
runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1);
- flowFile = runner.
- getFlowFilesForRelationship(CompressContent.REL_SUCCESS).
- get(0);
- flowFile.assertContentEquals(Paths.
- get("src/test/resources/CompressedData/SampleFile.txt"));
+ flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0);
+ flowFile.assertContentEquals(Paths.get("src/test/resources/CompressedData/SampleFile.txt"));
flowFile.assertAttributeEquals("filename", "SampleFile1.txt");
}
@Test
public void testFilenameUpdatedOnCompress() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(CompressContent.class);
+ final TestRunner runner = TestRunners.newTestRunner(CompressContent.class);
runner.setProperty(CompressContent.MODE, "compress");
runner.setProperty(CompressContent.COMPRESSION_FORMAT, "gzip");
- assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true").
- isValid());
+ assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true").isValid());
- runner.enqueue(Paths.
- get("src/test/resources/CompressedData/SampleFile.txt"));
+ runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFile.txt"));
runner.run();
runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1);
- MockFlowFile flowFile = runner.
- getFlowFilesForRelationship(CompressContent.REL_SUCCESS).
- get(0);
+ MockFlowFile flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0);
flowFile.assertAttributeEquals("filename", "SampleFile.txt.gz");
}
@Test
public void testDecompressFailure() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(CompressContent.class);
+ final TestRunner runner = TestRunners.newTestRunner(CompressContent.class);
runner.setProperty(CompressContent.MODE, "decompress");
runner.setProperty(CompressContent.COMPRESSION_FORMAT, "gzip");
byte[] data = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
runner.enqueue(data);
- assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true").
- isValid());
+ assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true").isValid());
runner.run();
runner.assertQueueEmpty();
runner.assertAllFlowFilesTransferred(CompressContent.REL_FAILURE, 1);
- runner.getFlowFilesForRelationship(CompressContent.REL_FAILURE).
- get(0).
- assertContentEquals(data);
+ runner.getFlowFilesForRelationship(CompressContent.REL_FAILURE).get(0).assertContentEquals(data);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
index dcec7b3..7729056 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java
@@ -29,8 +29,7 @@ public class TestControlRate {
@Test
public void testViaAttribute() throws InterruptedException {
final TestRunner runner = TestRunners.newTestRunner(new ControlRate());
- runner.
- setProperty(ControlRate.RATE_CONTROL_CRITERIA, ControlRate.ATTRIBUTE_RATE);
+ runner.setProperty(ControlRate.RATE_CONTROL_CRITERIA, ControlRate.ATTRIBUTE_RATE);
runner.setProperty(ControlRate.RATE_CONTROL_ATTRIBUTE_NAME, "count");
runner.setProperty(ControlRate.MAX_RATE, "20000");
runner.setProperty(ControlRate.TIME_PERIOD, "1 sec");
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java
index f303019..1b057d9 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java
@@ -29,21 +29,16 @@ public class TestConvertCharacterSet {
@Test
public void test() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ConvertCharacterSet());
+ final TestRunner runner = TestRunners.newTestRunner(new ConvertCharacterSet());
runner.setProperty(ConvertCharacterSet.INPUT_CHARSET, "ASCII");
runner.setProperty(ConvertCharacterSet.OUTPUT_CHARSET, "UTF-32");
- runner.enqueue(Paths.
- get("src/test/resources/CharacterSetConversionSamples/Original.txt"));
+ runner.enqueue(Paths.get("src/test/resources/CharacterSetConversionSamples/Original.txt"));
runner.run();
runner.assertAllFlowFilesTransferred(ConvertCharacterSet.REL_SUCCESS, 1);
- final MockFlowFile output = runner.
- getFlowFilesForRelationship(ConvertCharacterSet.REL_SUCCESS).
- get(0);
- output.
- assertContentEquals(new File("src/test/resources/CharacterSetConversionSamples/Converted2.txt"));
+ final MockFlowFile output = runner.getFlowFilesForRelationship(ConvertCharacterSet.REL_SUCCESS).get(0);
+ output.assertContentEquals(new File("src/test/resources/CharacterSetConversionSamples/Converted2.txt"));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
index ef69a00..e8434f0 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java
@@ -50,10 +50,8 @@ public class TestDetectDuplicate {
System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
System.setProperty("org.slf4j.simpleLogger.showDateTime", "true");
System.setProperty("org.slf4j.simpleLogger.log.nifi.io.nio", "debug");
- System.
- setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.DetectDuplicate", "debug");
- System.
- setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.TestDetectDuplicate", "debug");
+ System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.DetectDuplicate", "debug");
+ System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.TestDetectDuplicate", "debug");
LOGGER = LoggerFactory.getLogger(TestListenUDP.class);
}
@@ -62,12 +60,10 @@ public class TestDetectDuplicate {
TestRunner runner = TestRunners.newTestRunner(DetectDuplicate.class);
final DistributedMapCacheClientImpl client = createClient();
final Map<String, String> clientProperties = new HashMap<>();
- clientProperties.
- put(DistributedMapCacheClientService.HOSTNAME.getName(), "localhost");
+ clientProperties.put(DistributedMapCacheClientService.HOSTNAME.getName(), "localhost");
runner.addControllerService("client", client, clientProperties);
runner.setProperty(DetectDuplicate.DISTRIBUTED_CACHE_SERVICE, "client");
- runner.
- setProperty(DetectDuplicate.FLOWFILE_DESCRIPTION, "The original flow file");
+ runner.setProperty(DetectDuplicate.FLOWFILE_DESCRIPTION, "The original flow file");
runner.setProperty(DetectDuplicate.AGE_OFF_DURATION, "48 hours");
Map<String, String> props = new HashMap<>();
props.put("hash.value", "1000");
@@ -75,8 +71,7 @@ public class TestDetectDuplicate {
runner.enableControllerService(client);
runner.run();
- runner.
- assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1);
+ runner.assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1);
runner.clearTransferState();
client.exists = true;
runner.enqueue(new byte[]{}, props);
@@ -92,12 +87,10 @@ public class TestDetectDuplicate {
TestRunner runner = TestRunners.newTestRunner(DetectDuplicate.class);
final DistributedMapCacheClientImpl client = createClient();
final Map<String, String> clientProperties = new HashMap<>();
- clientProperties.
- put(DistributedMapCacheClientService.HOSTNAME.getName(), "localhost");
+ clientProperties.put(DistributedMapCacheClientService.HOSTNAME.getName(), "localhost");
runner.addControllerService("client", client, clientProperties);
runner.setProperty(DetectDuplicate.DISTRIBUTED_CACHE_SERVICE, "client");
- runner.
- setProperty(DetectDuplicate.FLOWFILE_DESCRIPTION, "The original flow file");
+ runner.setProperty(DetectDuplicate.FLOWFILE_DESCRIPTION, "The original flow file");
runner.setProperty(DetectDuplicate.AGE_OFF_DURATION, "2 secs");
runner.enableControllerService(client);
@@ -106,15 +99,13 @@ public class TestDetectDuplicate {
runner.enqueue(new byte[]{}, props);
runner.run();
- runner.
- assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1);
+ runner.assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1);
runner.clearTransferState();
client.exists = true;
Thread.sleep(3000);
runner.enqueue(new byte[]{}, props);
runner.run();
- runner.
- assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1);
+ runner.assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1);
runner.assertTransferCount(DetectDuplicate.REL_DUPLICATE, 0);
runner.assertTransferCount(DetectDuplicate.REL_FAILURE, 0);
}
@@ -163,8 +154,7 @@ public class TestDetectDuplicate {
}
@Override
- public <K, V> V getAndPutIfAbsent(K key, V value, Serializer<K> keySerializer, Serializer<V> valueSerializer,
- Deserializer<V> valueDeserializer) throws IOException {
+ public <K, V> V getAndPutIfAbsent(K key, V value, Serializer<K> keySerializer, Serializer<V> valueSerializer, Deserializer<V> valueDeserializer) throws IOException {
if (exists) {
return (V) cacheValue;
}
@@ -212,8 +202,7 @@ public class TestDetectDuplicate {
}
if (child.exists()) {
- throw new IOException("Could not delete " + dataFile.
- getAbsolutePath());
+ throw new IOException("Could not delete " + dataFile.getAbsolutePath());
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java
index dfe52bf..ac2efec 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.DistributeLoad;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -36,8 +35,7 @@ public class TestDistributeLoad {
@Test
public void testDefaultRoundRobin() {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new DistributeLoad());
+ final TestRunner testRunner = TestRunners.newTestRunner(new DistributeLoad());
testRunner.setProperty(DistributeLoad.NUM_RELATIONSHIPS, "100");
for (int i = 0; i < 101; i++) {
@@ -53,8 +51,7 @@ public class TestDistributeLoad {
@Test
public void testWeightedRoundRobin() {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new DistributeLoad());
+ final TestRunner testRunner = TestRunners.newTestRunner(new DistributeLoad());
testRunner.setProperty(DistributeLoad.NUM_RELATIONSHIPS, "100");
testRunner.setProperty("1", "5");
@@ -74,8 +71,7 @@ public class TestDistributeLoad {
@Test
public void testValidationOnAddedProperties() {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new DistributeLoad());
+ final TestRunner testRunner = TestRunners.newTestRunner(new DistributeLoad());
testRunner.setProperty(DistributeLoad.NUM_RELATIONSHIPS, "100");
testRunner.setProperty("1", "5");
@@ -121,13 +117,10 @@ public class TestDistributeLoad {
@Test
public void testNextAvailable() {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new DistributeLoad());
+ final TestRunner testRunner = TestRunners.newTestRunner(new DistributeLoad());
- testRunner.
- setProperty(DistributeLoad.NUM_RELATIONSHIPS.getName(), "100");
- testRunner.
- setProperty(DistributeLoad.DISTRIBUTION_STRATEGY.getName(), DistributeLoad.STRATEGY_NEXT_AVAILABLE);
+ testRunner.setProperty(DistributeLoad.NUM_RELATIONSHIPS.getName(), "100");
+ testRunner.setProperty(DistributeLoad.DISTRIBUTION_STRATEGY.getName(), DistributeLoad.STRATEGY_NEXT_AVAILABLE);
for (int i = 0; i < 99; i++) {
testRunner.enqueue(new byte[0]);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncodeContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncodeContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncodeContent.java
index 5f6437a..fec411d 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncodeContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncodeContent.java
@@ -30,12 +30,10 @@ public class TestEncodeContent {
@Test
public void testBase64RoundTrip() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EncodeContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent());
testRunner.setProperty(EncodeContent.MODE, EncodeContent.ENCODE_MODE);
- testRunner.
- setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING);
+ testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING);
testRunner.enqueue(Paths.get("src/test/resources/hello.txt"));
testRunner.clearTransferState();
@@ -43,9 +41,7 @@ public class TestEncodeContent {
testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1);
- MockFlowFile flowFile = testRunner.
- getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).
- get(0);
+ MockFlowFile flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0);
testRunner.assertQueueEmpty();
testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE);
@@ -54,20 +50,16 @@ public class TestEncodeContent {
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1);
- flowFile = testRunner.
- getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).
- get(0);
+ flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0);
flowFile.assertContentEquals(new File("src/test/resources/hello.txt"));
}
@Test
public void testFailDecodeNotBase64() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EncodeContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent());
testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE);
- testRunner.
- setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING);
+ testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING);
testRunner.enqueue(Paths.get("src/test/resources/hello.txt"));
testRunner.clearTransferState();
@@ -78,12 +70,10 @@ public class TestEncodeContent {
@Test
public void testFailDecodeNotBase64ButIsAMultipleOfFourBytes() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EncodeContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent());
testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE);
- testRunner.
- setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING);
+ testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING);
testRunner.enqueue("four@@@@multiple".getBytes());
testRunner.clearTransferState();
@@ -94,12 +84,10 @@ public class TestEncodeContent {
@Test
public void testBase32RoundTrip() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EncodeContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent());
testRunner.setProperty(EncodeContent.MODE, EncodeContent.ENCODE_MODE);
- testRunner.
- setProperty(EncodeContent.ENCODING, EncodeContent.BASE32_ENCODING);
+ testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.BASE32_ENCODING);
testRunner.enqueue(Paths.get("src/test/resources/hello.txt"));
testRunner.clearTransferState();
@@ -107,9 +95,7 @@ public class TestEncodeContent {
testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1);
- MockFlowFile flowFile = testRunner.
- getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).
- get(0);
+ MockFlowFile flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0);
testRunner.assertQueueEmpty();
testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE);
@@ -118,20 +104,16 @@ public class TestEncodeContent {
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1);
- flowFile = testRunner.
- getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).
- get(0);
+ flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0);
flowFile.assertContentEquals(new File("src/test/resources/hello.txt"));
}
@Test
public void testFailDecodeNotBase32() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EncodeContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent());
testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE);
- testRunner.
- setProperty(EncodeContent.ENCODING, EncodeContent.BASE32_ENCODING);
+ testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.BASE32_ENCODING);
testRunner.enqueue(Paths.get("src/test/resources/hello.txt"));
testRunner.clearTransferState();
@@ -142,12 +124,10 @@ public class TestEncodeContent {
@Test
public void testHexRoundTrip() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EncodeContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent());
testRunner.setProperty(EncodeContent.MODE, EncodeContent.ENCODE_MODE);
- testRunner.
- setProperty(EncodeContent.ENCODING, EncodeContent.HEX_ENCODING);
+ testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.HEX_ENCODING);
testRunner.enqueue(Paths.get("src/test/resources/hello.txt"));
testRunner.clearTransferState();
@@ -155,9 +135,7 @@ public class TestEncodeContent {
testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1);
- MockFlowFile flowFile = testRunner.
- getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).
- get(0);
+ MockFlowFile flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0);
testRunner.assertQueueEmpty();
testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE);
@@ -166,20 +144,16 @@ public class TestEncodeContent {
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1);
- flowFile = testRunner.
- getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).
- get(0);
+ flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0);
flowFile.assertContentEquals(new File("src/test/resources/hello.txt"));
}
@Test
public void testFailDecodeNotHex() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EncodeContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent());
testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE);
- testRunner.
- setProperty(EncodeContent.ENCODING, EncodeContent.HEX_ENCODING);
+ testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.HEX_ENCODING);
testRunner.enqueue(Paths.get("src/test/resources/hello.txt"));
testRunner.clearTransferState();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java
index 1ec1fc9..7340e0f 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.EncryptContent;
import java.io.File;
import java.io.IOException;
import java.nio.file.Paths;
@@ -32,44 +31,33 @@ public class TestEncryptContent {
@Test
public void testRoundTrip() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EncryptContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new EncryptContent());
testRunner.setProperty(EncryptContent.PASSWORD, "Hello, World!");
for (final EncryptionMethod method : EncryptionMethod.values()) {
if (method.isUnlimitedStrength()) {
continue; // cannot test unlimited strength in unit tests because it's not enabled by the JVM by default.
}
- testRunner.setProperty(EncryptContent.ENCRYPTION_ALGORITHM, method.
- name());
- testRunner.
- setProperty(EncryptContent.MODE, EncryptContent.ENCRYPT_MODE);
+ testRunner.setProperty(EncryptContent.ENCRYPTION_ALGORITHM, method.name());
+ testRunner.setProperty(EncryptContent.MODE, EncryptContent.ENCRYPT_MODE);
testRunner.enqueue(Paths.get("src/test/resources/hello.txt"));
testRunner.clearTransferState();
testRunner.run();
- testRunner.
- assertAllFlowFilesTransferred(EncryptContent.REL_SUCCESS, 1);
+ testRunner.assertAllFlowFilesTransferred(EncryptContent.REL_SUCCESS, 1);
- MockFlowFile flowFile = testRunner.
- getFlowFilesForRelationship(EncryptContent.REL_SUCCESS).
- get(0);
+ MockFlowFile flowFile = testRunner.getFlowFilesForRelationship(EncryptContent.REL_SUCCESS).get(0);
testRunner.assertQueueEmpty();
- testRunner.
- setProperty(EncryptContent.MODE, EncryptContent.DECRYPT_MODE);
+ testRunner.setProperty(EncryptContent.MODE, EncryptContent.DECRYPT_MODE);
testRunner.enqueue(flowFile);
testRunner.clearTransferState();
testRunner.run();
- testRunner.
- assertAllFlowFilesTransferred(EncryptContent.REL_SUCCESS, 1);
+ testRunner.assertAllFlowFilesTransferred(EncryptContent.REL_SUCCESS, 1);
- flowFile = testRunner.
- getFlowFilesForRelationship(EncryptContent.REL_SUCCESS).
- get(0);
- flowFile.
- assertContentEquals(new File("src/test/resources/hello.txt"));
+ flowFile = testRunner.getFlowFilesForRelationship(EncryptContent.REL_SUCCESS).get(0);
+ flowFile.assertContentEquals(new File("src/test/resources/hello.txt"));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
index 25dfc1b..69d47c8 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java
@@ -38,77 +38,59 @@ import static org.junit.Assert.assertEquals;
public class TestEvaluateJsonPath {
- private static final Path JSON_SNIPPET = Paths.
- get("src/test/resources/TestJson/json-sample.json");
- private static final Path XML_SNIPPET = Paths.
- get("src/test/resources/TestXml/xml-snippet.xml");
+ private static final Path JSON_SNIPPET = Paths.get("src/test/resources/TestJson/json-sample.json");
+ private static final Path XML_SNIPPET = Paths.get("src/test/resources/TestXml/xml-snippet.xml");
@Test(expected = AssertionError.class)
public void testInvalidJsonPath() {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
testRunner.setProperty("invalid.jsonPath", "$..");
- Assert.
- fail("An improper JsonPath expression was not detected as being invalid.");
+ Assert.fail("An improper JsonPath expression was not detected as being invalid.");
}
@Test
public void testInvalidJsonDocument() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
- testRunner.
- assertAllFlowFilesTransferred(EvaluateJsonPath.REL_FAILURE, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateJsonPath.REL_FAILURE).
- get(0);
+ testRunner.assertAllFlowFilesTransferred(EvaluateJsonPath.REL_FAILURE, 1);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateJsonPath.REL_FAILURE).get(0);
}
@Test(expected = AssertionError.class)
public void testInvalidConfiguration_destinationContent_twoPaths() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
testRunner.setProperty("JsonPath1", "$[0]._id");
testRunner.setProperty("JsonPath2", "$[0].name");
testRunner.enqueue(JSON_SNIPPET);
testRunner.run();
- Assert.
- fail("Processor incorrectly ran with an invalid configuration of multiple paths specified as attributes for a destination of content.");
+ Assert.fail("Processor incorrectly ran with an invalid configuration of multiple paths specified as attributes for a destination of content.");
}
@Test(expected = AssertionError.class)
public void testInvalidConfiguration_invalidJsonPath_space() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
testRunner.setProperty("JsonPath1", "$[0]. _id");
testRunner.enqueue(JSON_SNIPPET);
testRunner.run();
- Assert.
- fail("Processor incorrectly ran with an invalid configuration of multiple paths specified as attributes for a destination of content.");
+ Assert.fail("Processor incorrectly ran with an invalid configuration of multiple paths specified as attributes for a destination of content.");
}
@Test
public void testConfiguration_destinationAttributes_twoPaths() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
testRunner.setProperty("JsonPath1", "$[0]._id");
testRunner.setProperty("JsonPath2", "$[0].name");
@@ -120,10 +102,8 @@ public class TestEvaluateJsonPath {
public void testExtractPath_destinationAttribute() throws Exception {
String jsonPathAttrKey = "JsonPath";
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
testRunner.setProperty(jsonPathAttrKey, "$[0]._id");
testRunner.enqueue(JSON_SNIPPET);
@@ -132,22 +112,15 @@ public class TestEvaluateJsonPath {
Relationship expectedRel = EvaluateJsonPath.REL_MATCH;
testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(expectedRel).
- get(0);
- Assert.
- assertEquals("Transferred flow file did not have the correct result", "54df94072d5dbf7dc6340cc5", out.
- getAttribute(jsonPathAttrKey));
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(expectedRel).get(0);
+ Assert.assertEquals("Transferred flow file did not have the correct result", "54df94072d5dbf7dc6340cc5", out.getAttribute(jsonPathAttrKey));
}
@Test
public void testExtractPath_destinationAttributes_twoPaths() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
- testRunner.
- setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
+ testRunner.setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON);
String jsonPathIdAttrKey = "evaluatejson.id";
String jsonPathNameAttrKey = "evaluatejson.name";
@@ -161,23 +134,15 @@ public class TestEvaluateJsonPath {
Relationship expectedRel = EvaluateJsonPath.REL_MATCH;
testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(expectedRel).
- get(0);
- Assert.
- assertEquals("Transferred flow file did not have the correct result for id attribute", "54df94072d5dbf7dc6340cc5", out.
- getAttribute(jsonPathIdAttrKey));
- Assert.
- assertEquals("Transferred flow file did not have the correct result for name attribute", "{\"first\":\"Shaffer\",\"last\":\"Pearson\"}", out.
- getAttribute(jsonPathNameAttrKey));
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(expectedRel).get(0);
+ Assert.assertEquals("Transferred flow file did not have the correct result for id attribute", "54df94072d5dbf7dc6340cc5", out.getAttribute(jsonPathIdAttrKey));
+ Assert.assertEquals("Transferred flow file did not have the correct result for name attribute", "{\"first\":\"Shaffer\",\"last\":\"Pearson\"}", out.getAttribute(jsonPathNameAttrKey));
}
@Test
public void testExtractPath_destinationAttributes_twoPaths_notFound() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
String jsonPathIdAttrKey = "evaluatejson.id";
String jsonPathNameAttrKey = "evaluatejson.name";
@@ -191,23 +156,15 @@ public class TestEvaluateJsonPath {
Relationship expectedRel = EvaluateJsonPath.REL_MATCH;
testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(expectedRel).
- get(0);
- Assert.
- assertEquals("Transferred flow file did not have the correct result for id attribute", "", out.
- getAttribute(jsonPathIdAttrKey));
- Assert.
- assertEquals("Transferred flow file did not have the correct result for name attribute", "", out.
- getAttribute(jsonPathNameAttrKey));
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(expectedRel).get(0);
+ Assert.assertEquals("Transferred flow file did not have the correct result for id attribute", "", out.getAttribute(jsonPathIdAttrKey));
+ Assert.assertEquals("Transferred flow file did not have the correct result for name attribute", "", out.getAttribute(jsonPathNameAttrKey));
}
@Test
public void testExtractPath_destinationAttributes_twoPaths_oneFound() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
String jsonPathIdAttrKey = "evaluatejson.id";
String jsonPathNameAttrKey = "evaluatejson.name";
@@ -221,25 +178,17 @@ public class TestEvaluateJsonPath {
Relationship expectedRel = EvaluateJsonPath.REL_MATCH;
testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(expectedRel).
- get(0);
- Assert.
- assertEquals("Transferred flow file did not have the correct result for id attribute", "54df94072d5dbf7dc6340cc5", out.
- getAttribute(jsonPathIdAttrKey));
- Assert.
- assertEquals("Transferred flow file did not have the correct result for name attribute", StringUtils.EMPTY, out.
- getAttribute(jsonPathNameAttrKey));
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(expectedRel).get(0);
+ Assert.assertEquals("Transferred flow file did not have the correct result for id attribute", "54df94072d5dbf7dc6340cc5", out.getAttribute(jsonPathIdAttrKey));
+ Assert.assertEquals("Transferred flow file did not have the correct result for name attribute", StringUtils.EMPTY, out.getAttribute(jsonPathNameAttrKey));
}
@Test
public void testExtractPath_destinationContent() throws Exception {
String jsonPathAttrKey = "JsonPath";
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
testRunner.setProperty(jsonPathAttrKey, "$[0]._id");
testRunner.enqueue(JSON_SNIPPET);
@@ -248,19 +197,15 @@ public class TestEvaluateJsonPath {
Relationship expectedRel = EvaluateJsonPath.REL_MATCH;
testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
- testRunner.getFlowFilesForRelationship(expectedRel).
- get(0).
- assertContentEquals("54df94072d5dbf7dc6340cc5");
+ testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals("54df94072d5dbf7dc6340cc5");
}
@Test
public void testExtractPath_destinationContent_indefiniteResult() throws Exception {
String jsonPathAttrKey = "friends.indefinite.id.list";
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
testRunner.setProperty(jsonPathAttrKey, "$[0].friends.[*].id");
testRunner.enqueue(JSON_SNIPPET);
@@ -269,19 +214,15 @@ public class TestEvaluateJsonPath {
Relationship expectedRel = EvaluateJsonPath.REL_MATCH;
testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
- testRunner.getFlowFilesForRelationship(expectedRel).
- get(0).
- assertContentEquals("[0,1,2]");
+ testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals("[0,1,2]");
}
@Test
public void testExtractPath_destinationContent_indefiniteResult_operators() throws Exception {
String jsonPathAttrKey = "friends.indefinite.id.list";
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
testRunner.setProperty(jsonPathAttrKey, "$[0].friends[?(@.id < 3)].id");
testRunner.enqueue(JSON_SNIPPET);
@@ -290,17 +231,13 @@ public class TestEvaluateJsonPath {
Relationship expectedRel = EvaluateJsonPath.REL_MATCH;
testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
- testRunner.getFlowFilesForRelationship(expectedRel).
- get(0).
- assertContentEquals("[0,1,2]");
+ testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals("[0,1,2]");
}
@Test
public void testRouteUnmatched_destinationContent_noMatch() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
testRunner.setProperty("jsonPath", "$[0].nonexistent.key");
testRunner.enqueue(JSON_SNIPPET);
@@ -309,21 +246,16 @@ public class TestEvaluateJsonPath {
Relationship expectedRel = EvaluateJsonPath.REL_NO_MATCH;
testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
- testRunner.getFlowFilesForRelationship(expectedRel).
- get(0).
- assertContentEquals(JSON_SNIPPET);
+ testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals(JSON_SNIPPET);
}
@Test
public void testRouteFailure_returnTypeScalar_resultArray() throws Exception {
String jsonPathAttrKey = "friends.indefinite.id.list";
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_SCALAR);
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_SCALAR);
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT);
testRunner.setProperty(jsonPathAttrKey, "$[0].friends[?(@.id < 3)].id");
testRunner.enqueue(JSON_SNIPPET);
@@ -332,34 +264,26 @@ public class TestEvaluateJsonPath {
Relationship expectedRel = EvaluateJsonPath.REL_FAILURE;
testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
- testRunner.getFlowFilesForRelationship(expectedRel).
- get(0).
- assertContentEquals(JSON_SNIPPET);
+ testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals(JSON_SNIPPET);
}
@Test
public void testNullInput() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON);
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON);
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
testRunner.setProperty("stringField", "$.stringField");
testRunner.setProperty("missingField", "$.missingField");
testRunner.setProperty("nullField", "$.nullField");
- ProcessSession session = testRunner.getProcessSessionFactory().
- createSession();
+ ProcessSession session = testRunner.getProcessSessionFactory().createSession();
FlowFile ff = session.create();
ff = session.write(ff, new OutputStreamCallback() {
@Override
public void process(OutputStream out) throws IOException {
try (OutputStream outputStream = new BufferedOutputStream(out)) {
- outputStream.
- write("{\"stringField\": \"String Value\", \"nullField\": null}".
- getBytes(StandardCharsets.UTF_8));
+ outputStream.write("{\"stringField\": \"String Value\", \"nullField\": null}".getBytes(StandardCharsets.UTF_8));
}
}
});
@@ -369,9 +293,7 @@ public class TestEvaluateJsonPath {
testRunner.assertTransferCount(EvaluateJsonPath.REL_MATCH, 1);
- FlowFile output = testRunner.
- getFlowFilesForRelationship(EvaluateJsonPath.REL_MATCH).
- get(0);
+ FlowFile output = testRunner.getFlowFilesForRelationship(EvaluateJsonPath.REL_MATCH).get(0);
String validFieldValue = output.getAttribute("stringField");
assertEquals("String Value", validFieldValue);
@@ -385,29 +307,22 @@ public class TestEvaluateJsonPath {
@Test
public void testNullInput_nullStringRepresentation() throws Exception {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateJsonPath());
- testRunner.
- setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON);
- testRunner.
- setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
- testRunner.
- setProperty(EvaluateJsonPath.NULL_VALUE_DEFAULT_REPRESENTATION, AbstractJsonPathProcessor.NULL_STRING_OPTION);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath());
+ testRunner.setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON);
+ testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE);
+ testRunner.setProperty(EvaluateJsonPath.NULL_VALUE_DEFAULT_REPRESENTATION, AbstractJsonPathProcessor.NULL_STRING_OPTION);
testRunner.setProperty("stringField", "$.stringField");
testRunner.setProperty("missingField", "$.missingField");
testRunner.setProperty("nullField", "$.nullField");
- ProcessSession session = testRunner.getProcessSessionFactory().
- createSession();
+ ProcessSession session = testRunner.getProcessSessionFactory().createSession();
FlowFile ff = session.create();
ff = session.write(ff, new OutputStreamCallback() {
@Override
public void process(OutputStream out) throws IOException {
try (OutputStream outputStream = new BufferedOutputStream(out)) {
- outputStream.
- write("{\"stringField\": \"String Value\", \"nullField\": null}".
- getBytes(StandardCharsets.UTF_8));
+ outputStream.write("{\"stringField\": \"String Value\", \"nullField\": null}".getBytes(StandardCharsets.UTF_8));
}
}
});
@@ -417,9 +332,7 @@ public class TestEvaluateJsonPath {
testRunner.assertTransferCount(EvaluateJsonPath.REL_MATCH, 1);
- FlowFile output = testRunner.
- getFlowFilesForRelationship(EvaluateJsonPath.REL_MATCH).
- get(0);
+ FlowFile output = testRunner.getFlowFilesForRelationship(EvaluateJsonPath.REL_MATCH).get(0);
String validFieldValue = output.getAttribute("stringField");
assertEquals("String Value", validFieldValue);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java
index b88b9f9..95e475f 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.EvaluateXPath;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -33,81 +32,60 @@ import org.junit.Test;
public class TestEvaluateXPath {
- private static final Path XML_SNIPPET = Paths.
- get("src/test/resources/TestXml/xml-snippet.xml");
+ private static final Path XML_SNIPPET = Paths.get("src/test/resources/TestXml/xml-snippet.xml");
@Test
public void testAsAttribute() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXPath());
- testRunner.
- setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath());
+ testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE);
testRunner.setProperty("xpath.result1", "/");
- testRunner.
- setProperty("xpath.result2", "/*:bundle/node/subNode/value/text()");
+ testRunner.setProperty("xpath.result2", "/*:bundle/node/subNode/value/text()");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).get(0);
out.assertAttributeEquals("xpath.result2", "Hello");
- assertTrue(out.getAttribute("xpath.result1").
- contains("Hello"));
+ assertTrue(out.getAttribute("xpath.result1").contains("Hello"));
}
@Test
public void testCheckIfElementExists() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXPath());
- testRunner.
- setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath());
+ testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE);
testRunner.setProperty("xpath.result1", "/");
- testRunner.
- setProperty("xpath.result.exist.1", "boolean(/*:bundle/node)");
- testRunner.
- setProperty("xpath.result.exist.2", "boolean(/*:bundle/node2)");
+ testRunner.setProperty("xpath.result.exist.1", "boolean(/*:bundle/node)");
+ testRunner.setProperty("xpath.result.exist.2", "boolean(/*:bundle/node2)");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).
- get(0);
- assertTrue(out.getAttribute("xpath.result1").
- contains("Hello"));
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).get(0);
+ assertTrue(out.getAttribute("xpath.result1").contains("Hello"));
out.assertAttributeEquals("xpath.result.exist.1", "true");
out.assertAttributeEquals("xpath.result.exist.2", "false");
}
@Test
public void testUnmatched() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXPath());
- testRunner.
- setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath());
+ testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT);
testRunner.setProperty("xpath.result.exist.2", "/*:bundle/node2");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_NO_MATCH, 1);
- testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_NO_MATCH).
- get(0).
- assertContentEquals(XML_SNIPPET);
+ testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_NO_MATCH).get(0).assertContentEquals(XML_SNIPPET);
}
@Test(expected = java.lang.AssertionError.class)
public void testMultipleXPathForContent() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXPath());
- testRunner.
- setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT);
- testRunner.
- setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_AUTO);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath());
+ testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT);
+ testRunner.setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_AUTO);
testRunner.setProperty("some.property.1", "/*:bundle/node/subNode[1]");
testRunner.setProperty("some.property.2", "/*:bundle/node/subNode[2]");
@@ -117,19 +95,15 @@ public class TestEvaluateXPath {
@Test
public void testWriteToContent() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXPath());
- testRunner.
- setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath());
+ testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT);
testRunner.setProperty("some.property", "/*:bundle/node/subNode[1]");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).get(0);
final byte[] outData = testRunner.getContentAsByteArray(out);
final String outXml = new String(outData, "UTF-8");
assertTrue(outXml.contains("subNode"));
@@ -138,10 +112,8 @@ public class TestEvaluateXPath {
@Test
public void testFailureIfContentMatchesMultipleNodes() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXPath());
- testRunner.
- setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath());
+ testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT);
testRunner.setProperty("some.property", "/*:bundle/node/subNode");
testRunner.enqueue(XML_SNIPPET);
@@ -152,45 +124,33 @@ public class TestEvaluateXPath {
@Test
public void testWriteStringToContent() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXPath());
- testRunner.
- setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT);
- testRunner.
- setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_STRING);
- testRunner.
- setProperty("some.property", "/*:bundle/node/subNode[1]/value/text()");
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath());
+ testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT);
+ testRunner.setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_STRING);
+ testRunner.setProperty("some.property", "/*:bundle/node/subNode[1]/value/text()");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).get(0);
final byte[] outData = testRunner.getContentAsByteArray(out);
final String outXml = new String(outData, "UTF-8");
- assertTrue(outXml.trim().
- equals("Hello"));
+ assertTrue(outXml.trim().equals("Hello"));
}
@Test
public void testWriteNodeSetToAttribute() throws XPathFactoryConfigurationException, IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new EvaluateXPath());
- testRunner.
- setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE);
- testRunner.
- setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_NODESET);
+ final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath());
+ testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE);
+ testRunner.setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_NODESET);
testRunner.setProperty("some.property", "/*:bundle/node/subNode[1]");
testRunner.enqueue(XML_SNIPPET);
testRunner.run();
testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_MATCH, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).get(0);
final String outXml = out.getAttribute("some.property");
assertTrue(outXml.contains("subNode"));
assertTrue(outXml.contains("Hello"));
[03/12] incubator-nifi git commit: NIFI-271
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java
index 9e970f1..2e87441 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java
@@ -31,8 +31,7 @@ public class TestMonitorActivity {
@Test
public void testFirstMessage() throws InterruptedException, IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new MonitorActivity());
+ final TestRunner runner = TestRunners.newTestRunner(new MonitorActivity());
runner.setProperty(MonitorActivity.CONTINUALLY_SEND_MESSAGES, "false");
runner.setProperty(MonitorActivity.THRESHOLD, "100 millis");
@@ -66,12 +65,9 @@ public class TestMonitorActivity {
runner.assertTransferCount(MonitorActivity.REL_SUCCESS, 1);
runner.assertTransferCount(MonitorActivity.REL_ACTIVITY_RESTORED, 1);
- MockFlowFile restoredFlowFile = runner.
- getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).
- get(0);
+ MockFlowFile restoredFlowFile = runner.getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).get(0);
String flowFileContent = new String(restoredFlowFile.toByteArray());
- Assert.assertTrue(Pattern.
- matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent));
+ Assert.assertTrue(Pattern.matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent));
restoredFlowFile.assertAttributeNotExists("key");
restoredFlowFile.assertAttributeNotExists("key1");
@@ -96,20 +92,16 @@ public class TestMonitorActivity {
runner.assertTransferCount(MonitorActivity.REL_ACTIVITY_RESTORED, 1);
runner.assertTransferCount(MonitorActivity.REL_SUCCESS, 1);
- restoredFlowFile = runner.
- getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).
- get(0);
+ restoredFlowFile = runner.getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).get(0);
flowFileContent = new String(restoredFlowFile.toByteArray());
- Assert.assertTrue(Pattern.
- matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent));
+ Assert.assertTrue(Pattern.matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent));
restoredFlowFile.assertAttributeNotExists("key");
restoredFlowFile.assertAttributeNotExists("key1");
}
@Test
public void testFirstMessageWithInherit() throws InterruptedException, IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new MonitorActivity());
+ final TestRunner runner = TestRunners.newTestRunner(new MonitorActivity());
runner.setProperty(MonitorActivity.CONTINUALLY_SEND_MESSAGES, "false");
runner.setProperty(MonitorActivity.THRESHOLD, "100 millis");
runner.setProperty(MonitorActivity.COPY_ATTRIBUTES, "true");
@@ -117,9 +109,7 @@ public class TestMonitorActivity {
runner.enqueue(new byte[0]);
runner.run();
runner.assertAllFlowFilesTransferred(MonitorActivity.REL_SUCCESS, 1);
- MockFlowFile originalFlowFile = runner.
- getFlowFilesForRelationship(MonitorActivity.REL_SUCCESS).
- get(0);
+ MockFlowFile originalFlowFile = runner.getFlowFilesForRelationship(MonitorActivity.REL_SUCCESS).get(0);
runner.clearTransferState();
Thread.sleep(1000L);
@@ -147,33 +137,21 @@ public class TestMonitorActivity {
runner.assertTransferCount(MonitorActivity.REL_SUCCESS, 1);
runner.assertTransferCount(MonitorActivity.REL_ACTIVITY_RESTORED, 1);
- MockFlowFile restoredFlowFile = runner.
- getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).
- get(0);
+ MockFlowFile restoredFlowFile = runner.getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).get(0);
String flowFileContent = new String(restoredFlowFile.toByteArray());
- Assert.assertTrue(Pattern.
- matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent));
+ Assert.assertTrue(Pattern.matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent));
restoredFlowFile.assertAttributeEquals("key", "value");
restoredFlowFile.assertAttributeEquals("key1", "value1");
// verify the UUIDs are not the same
- restoredFlowFile.
- assertAttributeNotEquals(CoreAttributes.UUID.key(), originalFlowFile.
- getAttribute(CoreAttributes.UUID.key()));
- restoredFlowFile.
- assertAttributeNotEquals(CoreAttributes.FILENAME.key(), originalFlowFile.
- getAttribute(CoreAttributes.FILENAME.key()));
+ restoredFlowFile.assertAttributeNotEquals(CoreAttributes.UUID.key(), originalFlowFile.getAttribute(CoreAttributes.UUID.key()));
+ restoredFlowFile.assertAttributeNotEquals(CoreAttributes.FILENAME.key(), originalFlowFile.getAttribute(CoreAttributes.FILENAME.key()));
Assert.assertTrue(
- String.
- format("file sizes match when they shouldn't original=%1$s restored=%2$s",
- originalFlowFile.getSize(), restoredFlowFile.getSize()),
- restoredFlowFile.getSize() != originalFlowFile.getSize());
- Assert.assertTrue(String.
- format("lineage start dates match when they shouldn't original=%1$s restored=%2$s",
- originalFlowFile.getLineageStartDate(), restoredFlowFile.
- getLineageStartDate()),
- restoredFlowFile.getLineageStartDate() != originalFlowFile.
- getLineageStartDate());
+ String.format("file sizes match when they shouldn't original=%1$s restored=%2$s",
+ originalFlowFile.getSize(), restoredFlowFile.getSize()), restoredFlowFile.getSize() != originalFlowFile.getSize());
+ Assert.assertTrue(
+ String.format("lineage start dates match when they shouldn't original=%1$s restored=%2$s",
+ originalFlowFile.getLineageStartDate(), restoredFlowFile.getLineageStartDate()), restoredFlowFile.getLineageStartDate() != originalFlowFile.getLineageStartDate());
runner.clearTransferState();
runner.setProperty(MonitorActivity.CONTINUALLY_SEND_MESSAGES, "true");
@@ -196,30 +174,18 @@ public class TestMonitorActivity {
runner.assertTransferCount(MonitorActivity.REL_ACTIVITY_RESTORED, 1);
runner.assertTransferCount(MonitorActivity.REL_SUCCESS, 1);
- restoredFlowFile = runner.
- getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).
- get(0);
+ restoredFlowFile = runner.getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).get(0);
flowFileContent = new String(restoredFlowFile.toByteArray());
- Assert.assertTrue(Pattern.
- matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent));
+ Assert.assertTrue(Pattern.matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent));
restoredFlowFile.assertAttributeEquals("key", "value");
restoredFlowFile.assertAttributeEquals("key1", "value1");
- restoredFlowFile.
- assertAttributeNotEquals(CoreAttributes.UUID.key(), originalFlowFile.
- getAttribute(CoreAttributes.UUID.key()));
- restoredFlowFile.
- assertAttributeNotEquals(CoreAttributes.FILENAME.key(), originalFlowFile.
- getAttribute(CoreAttributes.FILENAME.key()));
+ restoredFlowFile.assertAttributeNotEquals(CoreAttributes.UUID.key(), originalFlowFile.getAttribute(CoreAttributes.UUID.key()));
+ restoredFlowFile.assertAttributeNotEquals(CoreAttributes.FILENAME.key(), originalFlowFile.getAttribute(CoreAttributes.FILENAME.key()));
+ Assert.assertTrue(
+ String.format("file sizes match when they shouldn't original=%1$s restored=%2$s",
+ originalFlowFile.getSize(), restoredFlowFile.getSize()), restoredFlowFile.getSize() != originalFlowFile.getSize());
Assert.assertTrue(
- String.
- format("file sizes match when they shouldn't original=%1$s restored=%2$s",
- originalFlowFile.getSize(), restoredFlowFile.getSize()),
- restoredFlowFile.getSize() != originalFlowFile.getSize());
- Assert.assertTrue(String.
- format("lineage start dates match when they shouldn't original=%1$s restored=%2$s",
- originalFlowFile.getLineageStartDate(), restoredFlowFile.
- getLineageStartDate()),
- restoredFlowFile.getLineageStartDate() != originalFlowFile.
- getLineageStartDate());
+ String.format("lineage start dates match when they shouldn't original=%1$s restored=%2$s",
+ originalFlowFile.getLineageStartDate(), restoredFlowFile.getLineageStartDate()), restoredFlowFile.getLineageStartDate() != originalFlowFile.getLineageStartDate());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
index f4c4367..bd35868 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
@@ -65,21 +65,16 @@ public class TestPostHTTP {
public void testTruststoreSSLOnly() throws Exception {
final Map<String, String> sslProps = new HashMap<>();
sslProps.put(TestServer.NEED_CLIENT_AUTH, "false");
- sslProps.
- put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- sslProps.
- put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ sslProps.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
+ sslProps.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
sslProps.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
setup(sslProps);
final SSLContextService sslContextService = new StandardSSLContextService();
runner.addControllerService("ssl-context", sslContextService);
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks");
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest");
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS");
runner.enableControllerService(sslContextService);
runner.setProperty(PostHTTP.URL, server.getSecureUrl());
@@ -94,33 +89,23 @@ public class TestPostHTTP {
@Test
public void testTwoWaySSL() throws Exception {
final Map<String, String> sslProps = new HashMap<>();
- sslProps.
- put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- sslProps.
- put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ sslProps.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
+ sslProps.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
sslProps.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
- sslProps.
- put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- sslProps.
- put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ sslProps.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
+ sslProps.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
sslProps.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
sslProps.put(TestServer.NEED_CLIENT_AUTH, "true");
setup(sslProps);
final SSLContextService sslContextService = new StandardSSLContextService();
runner.addControllerService("ssl-context", sslContextService);
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks");
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest");
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS");
- runner.
- setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/localhost-ks.jks");
- runner.
- setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "localtest");
- runner.
- setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, "JKS");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS");
+ runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/localhost-ks.jks");
+ runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "localtest");
+ runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, "JKS");
runner.enableControllerService(sslContextService);
runner.setProperty(PostHTTP.URL, server.getSecureUrl());
@@ -135,27 +120,20 @@ public class TestPostHTTP {
@Test
public void testOneWaySSLWhenServerConfiguredForTwoWay() throws Exception {
final Map<String, String> sslProps = new HashMap<>();
- sslProps.
- put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- sslProps.
- put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ sslProps.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
+ sslProps.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
sslProps.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
- sslProps.
- put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- sslProps.
- put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ sslProps.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
+ sslProps.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
sslProps.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
sslProps.put(TestServer.NEED_CLIENT_AUTH, "true");
setup(sslProps);
final SSLContextService sslContextService = new StandardSSLContextService();
runner.addControllerService("ssl-context", sslContextService);
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks");
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest");
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS");
runner.enableControllerService(sslContextService);
runner.setProperty(PostHTTP.URL, server.getSecureUrl());
@@ -191,8 +169,7 @@ public class TestPostHTTP {
FlowFileUnpackagerV3 unpacker = new FlowFileUnpackagerV3();
// unpack first flowfile received
- Map<String, String> receivedAttrs = unpacker.
- unpackageFlowFile(bais, baos);
+ Map<String, String> receivedAttrs = unpacker.unpackageFlowFile(bais, baos);
byte[] contentReceived = baos.toByteArray();
assertEquals("Hello", new String(contentReceived));
assertEquals("cba", receivedAttrs.get("abc"));
@@ -211,33 +188,23 @@ public class TestPostHTTP {
@Test
public void testSendAsFlowFileSecure() throws Exception {
final Map<String, String> sslProps = new HashMap<>();
- sslProps.
- put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- sslProps.
- put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ sslProps.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
+ sslProps.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
sslProps.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
- sslProps.
- put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- sslProps.
- put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ sslProps.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
+ sslProps.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
sslProps.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
sslProps.put(TestServer.NEED_CLIENT_AUTH, "true");
setup(sslProps);
final SSLContextService sslContextService = new StandardSSLContextService();
runner.addControllerService("ssl-context", sslContextService);
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks");
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest");
- runner.
- setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS");
- runner.
- setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/localhost-ks.jks");
- runner.
- setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "localtest");
- runner.
- setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, "JKS");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS");
+ runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/localhost-ks.jks");
+ runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "localtest");
+ runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, "JKS");
runner.enableControllerService(sslContextService);
runner.setProperty(PostHTTP.URL, server.getSecureUrl());
@@ -262,8 +229,7 @@ public class TestPostHTTP {
FlowFileUnpackagerV3 unpacker = new FlowFileUnpackagerV3();
// unpack first flowfile received
- Map<String, String> receivedAttrs = unpacker.
- unpackageFlowFile(bais, baos);
+ Map<String, String> receivedAttrs = unpacker.unpackageFlowFile(bais, baos);
byte[] contentReceived = baos.toByteArray();
assertEquals("Hello", new String(contentReceived));
assertEquals("cba", receivedAttrs.get("abc"));
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
index 313790e..af04cbc 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java
@@ -53,28 +53,21 @@ public class TestPutEmail {
final TestRunner runner = TestRunners.newTestRunner(new PutEmail());
runner.setProperty(PutEmail.HEADER_XMAILER, "TestingNiFi");
runner.setProperty(PutEmail.SMTP_HOSTNAME, "smtp-host");
- runner.
- setProperty(PutEmail.SMTP_SOCKET_FACTORY, "${dynamicSocketFactory}");
+ runner.setProperty(PutEmail.SMTP_SOCKET_FACTORY, "${dynamicSocketFactory}");
runner.setProperty(PutEmail.HEADER_XMAILER, "TestingNiFi");
runner.setProperty(PutEmail.FROM, "test@apache.org");
runner.setProperty(PutEmail.MESSAGE, "Message Body");
runner.setProperty(PutEmail.TO, "recipient@apache.org");
- ProcessSession session = runner.getProcessSessionFactory().
- createSession();
+ ProcessSession session = runner.getProcessSessionFactory().createSession();
FlowFile ff = session.create();
- ff = session.
- putAttribute(ff, "dynamicSocketFactory", "testingSocketFactory");
+ ff = session.putAttribute(ff, "dynamicSocketFactory", "testingSocketFactory");
ProcessContext context = runner.getProcessContext();
- String xmailer = context.getProperty(PutEmail.HEADER_XMAILER).
- evaluateAttributeExpressions(ff).
- getValue();
+ String xmailer = context.getProperty(PutEmail.HEADER_XMAILER).evaluateAttributeExpressions(ff).getValue();
assertEquals("X-Mailer Header", "TestingNiFi", xmailer);
- String socketFactory = context.getProperty(PutEmail.SMTP_SOCKET_FACTORY).
- evaluateAttributeExpressions(ff).
- getValue();
+ String socketFactory = context.getProperty(PutEmail.SMTP_SOCKET_FACTORY).evaluateAttributeExpressions(ff).getValue();
assertEquals("Socket Factory", "testingSocketFactory", socketFactory);
final Map<String, String> attributes = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
index 4722a84..e340468 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java
@@ -42,9 +42,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("Hlleo, World!".getBytes("UTF-8"));
}
@@ -59,9 +57,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("H[ell]o, World!");
}
@@ -78,9 +74,7 @@ public class TestReplaceText {
runner.enqueue(Paths.get("src/test/resources/hello.txt"), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
final String actual = new String(out.toByteArray(), StandardCharsets.UTF_8);
System.out.println(actual);
Assert.assertEquals(expected, actual);
@@ -98,9 +92,7 @@ public class TestReplaceText {
runner.enqueue(Paths.get("src/test/resources/hello.txt"), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
final String actual = new String(out.toByteArray(), StandardCharsets.UTF_8);
Assert.assertEquals("Hell123o, World!", actual);
}
@@ -119,9 +111,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("Hello, World!");
}
@@ -139,9 +129,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("H[$1]o, World!");
}
@@ -160,9 +148,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("Good-bye, World!");
}
@@ -181,9 +167,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("Hello, World!");
}
@@ -202,9 +186,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("Hell$2o, World!");
}
@@ -223,9 +205,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("H$do, World!");
}
@@ -244,9 +224,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("H$1o, World!");
}
@@ -261,9 +239,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("Ho, World!");
}
@@ -278,9 +254,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("Hello, World!");
}
@@ -295,9 +269,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("HeRRo, WorRd!");
}
@@ -315,9 +287,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("Good");
}
@@ -353,9 +323,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("Good");
}
@@ -364,8 +332,7 @@ public class TestReplaceText {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
runner.setProperty(ReplaceText.REGEX, ".*");
- runner.
- setProperty(ReplaceText.REPLACEMENT_VALUE, "${filename}\t${now():format(\"yyyy/MM/dd'T'HHmmss'Z'\")}\t${fileSize}\n");
+ runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${filename}\t${now():format(\"yyyy/MM/dd'T'HHmmss'Z'\")}\t${fileSize}\n");
final Map<String, String> attributes = new HashMap<>();
attributes.put("filename", "abc.txt");
@@ -374,9 +341,7 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
final String outContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
Assert.assertTrue(outContent.startsWith("abc.txt\t"));
System.out.println(outContent);
@@ -388,8 +353,7 @@ public class TestReplaceText {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
runner.setProperty(ReplaceText.REGEX, "(?s)(^.*)");
- runner.
- setProperty(ReplaceText.REPLACEMENT_VALUE, "attribute header\n\n${filename}\n\ndata header\n\n$1\n\nfooter");
+ runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "attribute header\n\n${filename}\n\ndata header\n\n$1\n\nfooter");
final Map<String, String> attributes = new HashMap<>();
attributes.put("filename", "abc.txt");
@@ -398,12 +362,9 @@ public class TestReplaceText {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
final String outContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
- Assert.assertTrue(outContent.
- equals("attribute header\n\nabc.txt\n\ndata header\n\nHello\nWorld!\n\nfooter"));
+ Assert.assertTrue(outContent.equals("attribute header\n\nabc.txt\n\ndata header\n\nHello\nWorld!\n\nfooter"));
System.out.println(outContent);
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java
index 9c19369..005c05a 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.ReplaceText;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -40,300 +39,236 @@ public class TestReplaceTextLineByLine {
public void testSimple() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "odo");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "ood");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/food.txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/food.txt")));
}
@Test
public void testBackReference() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "(DODO)");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "[$1]");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/[DODO].txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/[DODO].txt")));
}
@Test
public void testReplacementWithExpressionLanguageIsEscaped() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "(jo)");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "[${abc}]");
final Map<String, String> attributes = new HashMap<>();
attributes.put("abc", "$1");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/cu[$1]_Po[$1].txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/cu[$1]_Po[$1].txt")));
}
@Test
public void testRegexWithExpressionLanguage() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "${replaceKey}");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${replaceValue}");
final Map<String, String> attributes = new HashMap<>();
attributes.put("replaceKey", "Riley");
attributes.put("replaceValue", "Spider");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Spider.txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Spider.txt")));
}
@Test
public void testRegexWithExpressionLanguageIsEscaped() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "${replaceKey}");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${replaceValue}");
final Map<String, String> attributes = new HashMap<>();
attributes.put("replaceKey", "R.*y");
attributes.put("replaceValue", "Spider");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
}
@Test
public void testBackReferenceWithTooLargeOfIndexIsEscaped() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "(lu)");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "$1$2");
final Map<String, String> attributes = new HashMap<>();
attributes.put("replaceKey", "R.*y");
attributes.put("replaceValue", "Spiderman");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Blu$2e_clu$2e.txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Blu$2e_clu$2e.txt")));
}
@Test
public void testBackReferenceWithInvalidReferenceIsEscaped() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "(ew)");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "$d");
final Map<String, String> attributes = new HashMap<>();
attributes.put("replaceKey", "H.*o");
attributes.put("replaceValue", "Good-bye");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/D$d_h$d.txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/D$d_h$d.txt")));
}
@Test
public void testEscapingDollarSign() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "(DO)");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "\\$1");
final Map<String, String> attributes = new HashMap<>();
attributes.put("replaceKey", "H.*o");
attributes.put("replaceValue", "Good-bye");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/$1$1.txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/$1$1.txt")));
}
@Test
public void testReplaceWithEmptyString() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "(jo)");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/cu_Po.txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/cu_Po.txt")));
}
@Test
public void testWithNoMatch() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "Z");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "Morning");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
}
@Test
public void testWithMultipleMatches() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "l");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "R");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")));
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/BRue_cRue_RiRey.txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/BRue_cRue_RiRey.txt")));
}
@Test
public void testAttributeToContent() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, ".*");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${abc}");
final Map<String, String> attributes = new HashMap<>();
attributes.put("abc", "Good");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
- out.
- assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Good.txt")));
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
+ out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Good.txt")));
}
@Test
public void testAttributeToContentWindows() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, ".*");
runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${abc}");
final Map<String, String> attributes = new HashMap<>();
attributes.put("abc", "Good");
- runner.
- enqueue("<<<HEADER>>>\r\n<<BODY>>\r\n<<<FOOTER>>>\r".getBytes(), attributes);
+ runner.enqueue("<<<HEADER>>>\r\n<<BODY>>\r\n<<<FOOTER>>>\r".getBytes(), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
out.assertContentEquals("GoodGoodGood");
}
@@ -341,39 +276,31 @@ public class TestReplaceTextLineByLine {
public void testProblematicCase1() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, ".*");
- runner.
- setProperty(ReplaceText.REPLACEMENT_VALUE, "${filename}\t${now():format(\"yyyy/MM/dd'T'HHmmss'Z'\")}\t${fileSize}\n");
+ runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${filename}\t${now():format(\"yyyy/MM/dd'T'HHmmss'Z'\")}\t${fileSize}\n");
final Map<String, String> attributes = new HashMap<>();
attributes.put("filename", "abc.txt");
- runner.enqueue(translateNewLines(Paths.
- get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
+ runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes);
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
final String outContent = translateNewLines(new String(out.toByteArray(), StandardCharsets.UTF_8));
Assert.assertTrue(outContent.startsWith("abc.txt\t"));
System.out.println(outContent);
- Assert.assertTrue(outContent.endsWith("193\n") || outContent.
- endsWith("203\r\n"));
+ Assert.assertTrue(outContent.endsWith("193\n") || outContent.endsWith("203\r\n"));
}
@Test
public void testGetExistingContent() throws IOException {
final TestRunner runner = TestRunners.newTestRunner(new ReplaceText());
runner.setValidateExpressionUsage(false);
- runner.
- setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
+ runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE);
runner.setProperty(ReplaceText.REGEX, "(?s)(^.*)");
- runner.
- setProperty(ReplaceText.REPLACEMENT_VALUE, "attribute header\n\n${filename}\n\ndata header\n\n$1\n\nfooter\n");
+ runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "attribute header\n\n${filename}\n\ndata header\n\n$1\n\nfooter\n");
final Map<String, String> attributes = new HashMap<>();
attributes.put("filename", "abc.txt");
@@ -382,14 +309,11 @@ public class TestReplaceTextLineByLine {
runner.run();
runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).
- get(0);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0);
final String outContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
System.out.println(outContent);
- Assert.assertTrue(outContent.
- equals("attribute header\n\nabc.txt\n\ndata header\n\nHello\n\n\nfooter\n"
- + "attribute header\n\nabc.txt\n\ndata header\n\nWorld!\n\nfooter\n"));
+ Assert.assertTrue(outContent.equals("attribute header\n\nabc.txt\n\ndata header\n\nHello\n\n\nfooter\n"
+ + "attribute header\n\nabc.txt\n\ndata header\n\nWorld!\n\nfooter\n"));
}
@@ -400,15 +324,13 @@ public class TestReplaceTextLineByLine {
private byte[] translateNewLines(final Path path) throws IOException {
final byte[] data = Files.readAllBytes(path);
final String text = new String(data, StandardCharsets.UTF_8);
- return translateNewLines(text).
- getBytes(StandardCharsets.UTF_8);
+ return translateNewLines(text).getBytes(StandardCharsets.UTF_8);
}
private String translateNewLines(final String text) {
final String lineSeparator = System.getProperty("line.separator");
final Pattern pattern = Pattern.compile("\n", Pattern.MULTILINE);
- final String translated = pattern.matcher(text).
- replaceAll(lineSeparator);
+ final String translated = pattern.matcher(text).replaceAll(lineSeparator);
return translated;
}
}
[02/12] incubator-nifi git commit: NIFI-271
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextWithMapping.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextWithMapping.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextWithMapping.java
index 89f330b..7a480a8 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextWithMapping.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextWithMapping.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.ReplaceTextWithMapping;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
@@ -36,23 +35,15 @@ public class TestReplaceTextWithMapping {
@Test
public void testSimple() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
- final String mappingFile = Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").
- toFile().
- getAbsolutePath();
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
+ final String mappingFile = Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").toFile().getAbsolutePath();
runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, mappingFile);
- runner.enqueue(Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "roses are apple\n"
+ "violets are blueberry\n"
@@ -63,12 +54,8 @@ public class TestReplaceTextWithMapping {
@Test
public void testExpressionLanguageInText() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
- final String mappingFile = Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").
- toFile().
- getAbsolutePath();
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
+ final String mappingFile = Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").toFile().getAbsolutePath();
runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, mappingFile);
String text = "${foo} red ${baz}";
@@ -76,11 +63,8 @@ public class TestReplaceTextWithMapping {
runner.enqueue(text.getBytes());
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "${foo} apple ${baz}";
assertEquals(expected, outputString);
@@ -88,27 +72,19 @@ public class TestReplaceTextWithMapping {
@Test
public void testExpressionLanguageInText2() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
- final String mappingFile = Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").
- toFile().
- getAbsolutePath();
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
+ final String mappingFile = Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").toFile().getAbsolutePath();
runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, mappingFile);
runner.setProperty(ReplaceTextWithMapping.REGEX, "\\|(.*?)\\|");
- runner.
- setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
+ runner.setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
String text = "${foo}|red|${baz}";
runner.enqueue(text.getBytes());
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "${foo}|apple|${baz}";
assertEquals(expected, outputString);
@@ -116,27 +92,19 @@ public class TestReplaceTextWithMapping {
@Test
public void testExpressionLanguageInText3() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
- final String mappingFile = Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").
- toFile().
- getAbsolutePath();
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
+ final String mappingFile = Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").toFile().getAbsolutePath();
runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, mappingFile);
runner.setProperty(ReplaceTextWithMapping.REGEX, ".*\\|(.*?)\\|.*");
- runner.
- setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
+ runner.setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
String text = "${foo}|red|${baz}";
runner.enqueue(text.getBytes());
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "${foo}|apple|${baz}";
assertEquals(expected, outputString);
@@ -144,25 +112,16 @@ public class TestReplaceTextWithMapping {
@Test
public void testWithMatchingGroupAndContext() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
runner.setProperty(ReplaceTextWithMapping.REGEX, "-(.*?)-");
- runner.
- setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
- runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").
- toFile().
- getAbsolutePath());
-
- runner.enqueue(Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors.txt"));
+ runner.setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
+ runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").toFile().getAbsolutePath());
+
+ runner.enqueue(Paths.get("src/test/resources/TestReplaceTextWithMapping/colors.txt"));
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "-roses- are -apple-\n"
+ "violets are -blueberry-\n"
@@ -173,25 +132,16 @@ public class TestReplaceTextWithMapping {
@Test
public void testBackReference() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
runner.setProperty(ReplaceTextWithMapping.REGEX, "(\\S+)");
- runner.
- setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
- runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-backreference-mapping.txt").
- toFile().
- getAbsolutePath());
-
- runner.enqueue(Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
+ runner.setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
+ runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-backreference-mapping.txt").toFile().getAbsolutePath());
+
+ runner.enqueue(Paths.get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "roses are red apple\n"
+ "violets are blue blueberry\n"
@@ -202,47 +152,32 @@ public class TestReplaceTextWithMapping {
@Test
public void testRoutesToFailureIfTooLarge() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
runner.setProperty(ReplaceTextWithMapping.REGEX, "[123]");
runner.setProperty(ReplaceTextWithMapping.MAX_BUFFER_SIZE, "1 b");
- runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").
- toFile().
- getAbsolutePath());
+ runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt").toFile().getAbsolutePath());
final Map<String, String> attributes = new HashMap<>();
attributes.put("abc", "Good");
- runner.enqueue(Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestReplaceTextWithMapping/colors.txt"));
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_FAILURE, 1);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_FAILURE, 1);
}
@Test
public void testBackReferenceWithTooLargeOfIndexIsEscaped() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
runner.setProperty(ReplaceTextWithMapping.REGEX, "-(.*?)-");
- runner.
- setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
- runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping.txt").
- toFile().
- getAbsolutePath());
-
- runner.enqueue(Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors.txt"));
+ runner.setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
+ runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping.txt").toFile().getAbsolutePath());
+
+ runner.enqueue(Paths.get("src/test/resources/TestReplaceTextWithMapping/colors.txt"));
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "-roses- are -red$2 apple-\n"
+ "violets are -blue$2 blueberry-\n"
@@ -253,23 +188,15 @@ public class TestReplaceTextWithMapping {
@Test
public void testBackReferenceWithTooLargeOfIndexIsEscapedSimple() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE,
- Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping-simple.txt").
- toFile().
- getAbsolutePath());
+ Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping-simple.txt").toFile().getAbsolutePath());
- runner.enqueue(Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
+ runner.enqueue(Paths.get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "roses are red$1 apple\n"
+ "violets are blue$1 blueberry\n"
@@ -280,25 +207,16 @@ public class TestReplaceTextWithMapping {
@Test
public void testBackReferenceWithInvalidReferenceIsEscaped() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
runner.setProperty(ReplaceTextWithMapping.REGEX, "(\\S+)");
- runner.
- setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
- runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-invalid-backreference-mapping.txt").
- toFile().
- getAbsolutePath());
-
- runner.enqueue(Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
+ runner.setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
+ runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-invalid-backreference-mapping.txt").toFile().getAbsolutePath());
+
+ runner.enqueue(Paths.get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "roses are red$d apple\n"
+ "violets are blue$d blueberry\n"
@@ -309,25 +227,16 @@ public class TestReplaceTextWithMapping {
@Test
public void testEscapingDollarSign() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
runner.setProperty(ReplaceTextWithMapping.REGEX, "-(.*?)-");
- runner.
- setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
- runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-escaped-dollar-mapping.txt").
- toFile().
- getAbsolutePath());
-
- runner.enqueue(Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors.txt"));
+ runner.setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
+ runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-escaped-dollar-mapping.txt").toFile().getAbsolutePath());
+
+ runner.enqueue(Paths.get("src/test/resources/TestReplaceTextWithMapping/colors.txt"));
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "-roses- are -$1 apple-\n"
+ "violets are -$1 blueberry-\n"
@@ -338,22 +247,14 @@ public class TestReplaceTextWithMapping {
@Test
public void testEscapingDollarSignSimple() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
- runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-escaped-dollar-mapping.txt").
- toFile().
- getAbsolutePath());
-
- runner.enqueue(Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
+ runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-escaped-dollar-mapping.txt").toFile().getAbsolutePath());
+
+ runner.enqueue(Paths.get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "roses are $1 apple\n"
+ "violets are $1 blueberry\n"
@@ -364,22 +265,14 @@ public class TestReplaceTextWithMapping {
@Test
public void testReplaceWithEmptyString() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
- runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-blank-mapping.txt").
- toFile().
- getAbsolutePath());
-
- runner.enqueue(Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
+ runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-blank-mapping.txt").toFile().getAbsolutePath());
+
+ runner.enqueue(Paths.get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "roses are \n"
+ "violets are \n"
@@ -390,22 +283,14 @@ public class TestReplaceTextWithMapping {
@Test
public void testReplaceWithSpaceInString() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
- runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-space-mapping.txt").
- toFile().
- getAbsolutePath());
-
- runner.enqueue(Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
+ runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-space-mapping.txt").toFile().getAbsolutePath());
+
+ runner.enqueue(Paths.get("src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt"));
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = "roses are really red\n"
+ "violets are super blue\n"
@@ -416,26 +301,17 @@ public class TestReplaceTextWithMapping {
@Test
public void testWithNoMatch() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
runner.setProperty(ReplaceTextWithMapping.REGEX, "-(.*?)-");
- runner.
- setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
- runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-fruit-no-match-mapping.txt").
- toFile().
- getAbsolutePath());
-
- final Path path = Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors.txt");
+ runner.setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "1");
+ runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.get("src/test/resources/TestReplaceTextWithMapping/color-fruit-no-match-mapping.txt").toFile().getAbsolutePath());
+
+ final Path path = Paths.get("src/test/resources/TestReplaceTextWithMapping/colors.txt");
runner.enqueue(path);
runner.run();
- runner.
- assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
- final MockFlowFile out = runner.
- getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).
- get(0);
+ runner.assertAllFlowFilesTransferred(ReplaceTextWithMapping.REL_SUCCESS, 1);
+ final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceTextWithMapping.REL_SUCCESS).get(0);
String outputString = new String(out.toByteArray());
String expected = new String(Files.readAllBytes(path));
assertEquals(expected, outputString);
@@ -443,18 +319,12 @@ public class TestReplaceTextWithMapping {
@Test(expected = java.lang.AssertionError.class)
public void testMatchingGroupForLookupKeyTooLarge() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new ReplaceTextWithMapping());
+ final TestRunner runner = TestRunners.newTestRunner(new ReplaceTextWithMapping());
runner.setProperty(ReplaceTextWithMapping.REGEX, "-(.*?)-");
- runner.
- setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "2");
- runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.
- get("src/test/resources/TestReplaceTextWithMapping/color-mapping.txt").
- toFile().
- getAbsolutePath());
-
- final Path path = Paths.
- get("src/test/resources/TestReplaceTextWithMapping/colors.txt");
+ runner.setProperty(ReplaceTextWithMapping.MATCHING_GROUP_FOR_LOOKUP_KEY, "2");
+ runner.setProperty(ReplaceTextWithMapping.MAPPING_FILE, Paths.get("src/test/resources/TestReplaceTextWithMapping/color-mapping.txt").toFile().getAbsolutePath());
+
+ final Path path = Paths.get("src/test/resources/TestReplaceTextWithMapping/colors.txt");
runner.enqueue(path);
runner.run();
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnAttribute.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnAttribute.java
index 56996fe..2eac3f2 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnAttribute.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnAttribute.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.RouteOnAttribute;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -40,8 +39,7 @@ public class TestRouteOnAttribute {
public void testInvalidOnMisconfiguredProperty() {
final RouteOnAttribute proc = new RouteOnAttribute();
final MockProcessContext ctx = new MockProcessContext(proc);
- final ValidationResult validationResult = ctx.
- setProperty("RouteA", "${a:equals('b')"); // Missing closing brace
+ final ValidationResult validationResult = ctx.setProperty("RouteA", "${a:equals('b')"); // Missing closing brace
assertFalse(validationResult.isValid());
}
@@ -49,15 +47,13 @@ public class TestRouteOnAttribute {
public void testInvalidOnNonBooleanProperty() {
final RouteOnAttribute proc = new RouteOnAttribute();
final MockProcessContext ctx = new MockProcessContext(proc);
- final ValidationResult validationResult = ctx.
- setProperty("RouteA", "${a:length()"); // Should be boolean
+ final ValidationResult validationResult = ctx.setProperty("RouteA", "${a:length()"); // Should be boolean
assertFalse(validationResult.isValid());
}
@Test
public void testSimpleEquals() {
- final TestRunner runner = TestRunners.
- newTestRunner(new RouteOnAttribute());
+ final TestRunner runner = TestRunners.newTestRunner(new RouteOnAttribute());
runner.setProperty("RouteA", "${a:equals('b')}");
final Map<String, String> attributes = new HashMap<>();
@@ -66,24 +62,16 @@ public class TestRouteOnAttribute {
runner.run();
- runner.assertAllFlowFilesTransferred(new Relationship.Builder().
- name("RouteA").
- build(), 1);
- final List<MockFlowFile> flowFiles = runner.
- getFlowFilesForRelationship("RouteA");
- flowFiles.get(0).
- assertAttributeEquals("a", "b");
- flowFiles.get(0).
- assertAttributeEquals(RouteOnAttribute.ROUTE_ATTRIBUTE_KEY, "RouteA");
+ runner.assertAllFlowFilesTransferred(new Relationship.Builder().name("RouteA").build(), 1);
+ final List<MockFlowFile> flowFiles = runner.getFlowFilesForRelationship("RouteA");
+ flowFiles.get(0).assertAttributeEquals("a", "b");
+ flowFiles.get(0).assertAttributeEquals(RouteOnAttribute.ROUTE_ATTRIBUTE_KEY, "RouteA");
}
@Test
public void testMatchAll() {
- final TestRunner runner = TestRunners.
- newTestRunner(new RouteOnAttribute());
- runner.
- setProperty(RouteOnAttribute.ROUTE_STRATEGY, RouteOnAttribute.ROUTE_ALL_MATCH.
- getValue());
+ final TestRunner runner = TestRunners.newTestRunner(new RouteOnAttribute());
+ runner.setProperty(RouteOnAttribute.ROUTE_STRATEGY, RouteOnAttribute.ROUTE_ALL_MATCH.getValue());
runner.setProperty("RouteA", "${a:equals('b')}");
runner.setProperty("RouteB", "${b:equals('a')}");
@@ -103,36 +91,27 @@ public class TestRouteOnAttribute {
runner.run(4);
- final List<MockFlowFile> match = runner.
- getFlowFilesForRelationship(RouteOnAttribute.REL_MATCH);
- final List<MockFlowFile> noMatch = runner.
- getFlowFilesForRelationship(RouteOnAttribute.REL_NO_MATCH);
+ final List<MockFlowFile> match = runner.getFlowFilesForRelationship(RouteOnAttribute.REL_MATCH);
+ final List<MockFlowFile> noMatch = runner.getFlowFilesForRelationship(RouteOnAttribute.REL_NO_MATCH);
assertEquals(1, match.size());
assertEquals(3, noMatch.size());
for (final MockFlowFile ff : noMatch) {
- ff.
- assertAttributeEquals(RouteOnAttribute.ROUTE_ATTRIBUTE_KEY, "unmatched");
+ ff.assertAttributeEquals(RouteOnAttribute.ROUTE_ATTRIBUTE_KEY, "unmatched");
}
- final Map<String, String> matchedAttrs = match.iterator().
- next().
- getAttributes();
+ final Map<String, String> matchedAttrs = match.iterator().next().getAttributes();
assertEquals("b", matchedAttrs.get("a"));
assertEquals("a", matchedAttrs.get("b"));
- assertEquals("matched", matchedAttrs.
- get(RouteOnAttribute.ROUTE_ATTRIBUTE_KEY));
+ assertEquals("matched", matchedAttrs.get(RouteOnAttribute.ROUTE_ATTRIBUTE_KEY));
}
@Test
public void testMatchAny() {
- final TestRunner runner = TestRunners.
- newTestRunner(new RouteOnAttribute());
+ final TestRunner runner = TestRunners.newTestRunner(new RouteOnAttribute());
runner.setThreadCount(4);
- runner.
- setProperty(RouteOnAttribute.ROUTE_STRATEGY, RouteOnAttribute.ROUTE_ANY_MATCHES.
- getValue());
+ runner.setProperty(RouteOnAttribute.ROUTE_STRATEGY, RouteOnAttribute.ROUTE_ANY_MATCHES.getValue());
runner.setProperty("RouteA", "${a:equals('b')}");
runner.setProperty("RouteB", "${b:equals('a')}");
@@ -152,20 +131,16 @@ public class TestRouteOnAttribute {
runner.run(4);
- final List<MockFlowFile> match = runner.
- getFlowFilesForRelationship(RouteOnAttribute.REL_MATCH);
- final List<MockFlowFile> noMatch = runner.
- getFlowFilesForRelationship(RouteOnAttribute.REL_NO_MATCH);
+ final List<MockFlowFile> match = runner.getFlowFilesForRelationship(RouteOnAttribute.REL_MATCH);
+ final List<MockFlowFile> noMatch = runner.getFlowFilesForRelationship(RouteOnAttribute.REL_NO_MATCH);
assertEquals(2, match.size());
assertEquals(2, noMatch.size());
// Get attributes for both matching FlowFiles
final Iterator<MockFlowFile> itr = match.iterator();
- final Map<String, String> attrs1 = itr.next().
- getAttributes();
- final Map<String, String> attrs2 = itr.next().
- getAttributes();
+ final Map<String, String> attrs1 = itr.next().getAttributes();
+ final Map<String, String> attrs2 = itr.next().getAttributes();
// Both matches should map a -> b
assertEquals("b", attrs1.get("a"));
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnContent.java
index 96c281a..fb89d86 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestRouteOnContent.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.RouteOnContent;
import java.io.IOException;
import java.nio.file.Paths;
import java.util.HashMap;
@@ -31,10 +30,8 @@ public class TestRouteOnContent {
@Test
public void testCloning() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new RouteOnContent());
- runner.
- setProperty(RouteOnContent.MATCH_REQUIREMENT, RouteOnContent.MATCH_SUBSEQUENCE);
+ final TestRunner runner = TestRunners.newTestRunner(new RouteOnContent());
+ runner.setProperty(RouteOnContent.MATCH_REQUIREMENT, RouteOnContent.MATCH_SUBSEQUENCE);
runner.setProperty("hello", "Hello");
runner.setProperty("world", "World");
@@ -48,10 +45,8 @@ public class TestRouteOnContent {
@Test
public void testSubstituteAttributes() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new RouteOnContent());
- runner.
- setProperty(RouteOnContent.MATCH_REQUIREMENT, RouteOnContent.MATCH_SUBSEQUENCE);
+ final TestRunner runner = TestRunners.newTestRunner(new RouteOnContent());
+ runner.setProperty(RouteOnContent.MATCH_REQUIREMENT, RouteOnContent.MATCH_SUBSEQUENCE);
runner.setProperty("attr", "Hel${highLow}");
final Map<String, String> attributes = new HashMap<>();
@@ -64,10 +59,8 @@ public class TestRouteOnContent {
@Test
public void testBufferSize() throws IOException {
- final TestRunner runner = TestRunners.
- newTestRunner(new RouteOnContent());
- runner.
- setProperty(RouteOnContent.MATCH_REQUIREMENT, RouteOnContent.MATCH_ALL);
+ final TestRunner runner = TestRunners.newTestRunner(new RouteOnContent());
+ runner.setProperty(RouteOnContent.MATCH_REQUIREMENT, RouteOnContent.MATCH_ALL);
runner.setProperty(RouteOnContent.BUFFER_SIZE, "3 B");
runner.setProperty("rel", "Hel");
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanAttribute.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanAttribute.java
index 982cf57..b4a4136 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanAttribute.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanAttribute.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.ScanAttribute;
import java.util.HashMap;
import java.util.Map;
@@ -30,8 +29,7 @@ public class TestScanAttribute {
@Test
public void testSingleMatch() {
final TestRunner runner = TestRunners.newTestRunner(new ScanAttribute());
- runner.
- setProperty(ScanAttribute.DICTIONARY_FILE, "src/test/resources/ScanAttribute/dictionary1");
+ runner.setProperty(ScanAttribute.DICTIONARY_FILE, "src/test/resources/ScanAttribute/dictionary1");
final Map<String, String> attributes = new HashMap<>();
attributes.put("abc", "world");
@@ -67,10 +65,8 @@ public class TestScanAttribute {
@Test
public void testAllMatch() {
final TestRunner runner = TestRunners.newTestRunner(new ScanAttribute());
- runner.
- setProperty(ScanAttribute.DICTIONARY_FILE, "src/test/resources/ScanAttribute/dictionary1");
- runner.
- setProperty(ScanAttribute.MATCHING_CRITERIA, ScanAttribute.MATCH_CRITERIA_ALL);
+ runner.setProperty(ScanAttribute.DICTIONARY_FILE, "src/test/resources/ScanAttribute/dictionary1");
+ runner.setProperty(ScanAttribute.MATCHING_CRITERIA, ScanAttribute.MATCH_CRITERIA_ALL);
runner.setProperty(ScanAttribute.ATTRIBUTE_PATTERN, "a.*");
final Map<String, String> attributes = new HashMap<>();
@@ -106,8 +102,7 @@ public class TestScanAttribute {
@Test
public void testWithEmptyEntries() {
final TestRunner runner = TestRunners.newTestRunner(new ScanAttribute());
- runner.
- setProperty(ScanAttribute.DICTIONARY_FILE, "src/test/resources/ScanAttribute/dictionary-with-empty-new-lines");
+ runner.setProperty(ScanAttribute.DICTIONARY_FILE, "src/test/resources/ScanAttribute/dictionary-with-empty-new-lines");
final Map<String, String> attributes = new HashMap<>();
attributes.put("abc", "");
@@ -127,8 +122,7 @@ public class TestScanAttribute {
@Test
public void testWithDictionaryFilter() {
final TestRunner runner = TestRunners.newTestRunner(new ScanAttribute());
- runner.
- setProperty(ScanAttribute.DICTIONARY_FILE, "src/test/resources/ScanAttribute/dictionary-with-extra-info");
+ runner.setProperty(ScanAttribute.DICTIONARY_FILE, "src/test/resources/ScanAttribute/dictionary-with-extra-info");
runner.setProperty(ScanAttribute.DICTIONARY_FILTER, "(.*)<greeting>");
final Map<String, String> attributes = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
index 442aa63..8c36845 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestScanContent.java
@@ -50,22 +50,15 @@ public class TestScanContent {
final byte[] termBytes = baos.toByteArray();
final Path dictionaryPath = Paths.get("target/dictionary");
- Files.
- write(dictionaryPath, termBytes, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
+ Files.write(dictionaryPath, termBytes, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
- final TestRunner runner = TestRunners.
- newTestRunner(new ScanContent());
+ final TestRunner runner = TestRunners.newTestRunner(new ScanContent());
runner.setThreadCount(1);
- runner.
- setProperty(ScanContent.DICTIONARY, dictionaryPath.
- toString());
- runner.
- setProperty(ScanContent.DICTIONARY_ENCODING, ScanContent.BINARY_ENCODING);
+ runner.setProperty(ScanContent.DICTIONARY, dictionaryPath.toString());
+ runner.setProperty(ScanContent.DICTIONARY_ENCODING, ScanContent.BINARY_ENCODING);
- runner.enqueue(Paths.
- get("src/test/resources/TestScanContent/helloWorld"));
- runner.enqueue(Paths.
- get("src/test/resources/TestScanContent/wellthengood-bye"));
+ runner.enqueue(Paths.get("src/test/resources/TestScanContent/helloWorld"));
+ runner.enqueue(Paths.get("src/test/resources/TestScanContent/wellthengood-bye"));
runner.enqueue(new byte[0]);
while (!runner.isQueueEmpty()) {
@@ -79,18 +72,13 @@ public class TestScanContent {
runner.assertTransferCount(ScanContent.REL_MATCH, 2);
runner.assertTransferCount(ScanContent.REL_NO_MATCH, 1);
- final List<MockFlowFile> matched = runner.
- getFlowFilesForRelationship(ScanContent.REL_MATCH);
- final List<MockFlowFile> unmatched = runner.
- getFlowFilesForRelationship(ScanContent.REL_NO_MATCH);
+ final List<MockFlowFile> matched = runner.getFlowFilesForRelationship(ScanContent.REL_MATCH);
+ final List<MockFlowFile> unmatched = runner.getFlowFilesForRelationship(ScanContent.REL_NO_MATCH);
- matched.get(0).
- assertAttributeEquals(ScanContent.MATCH_ATTRIBUTE_KEY, "hello");
- matched.get(1).
- assertAttributeEquals(ScanContent.MATCH_ATTRIBUTE_KEY, "good-bye");
+ matched.get(0).assertAttributeEquals(ScanContent.MATCH_ATTRIBUTE_KEY, "hello");
+ matched.get(1).assertAttributeEquals(ScanContent.MATCH_ATTRIBUTE_KEY, "good-bye");
- unmatched.get(0).
- assertAttributeNotExists(ScanContent.MATCH_ATTRIBUTE_KEY);
+ unmatched.get(0).assertAttributeNotExists(ScanContent.MATCH_ATTRIBUTE_KEY);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSegmentContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSegmentContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSegmentContent.java
index 7a6001c..5a88323 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSegmentContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSegmentContent.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.SegmentContent;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
@@ -32,15 +31,13 @@ public class TestSegmentContent {
@Test
public void test() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new SegmentContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new SegmentContent());
testRunner.setProperty(SegmentContent.SIZE, "4 B");
testRunner.enqueue(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9});
testRunner.run();
- final List<MockFlowFile> flowFiles = testRunner.
- getFlowFilesForRelationship(SegmentContent.REL_SEGMENTS);
+ final List<MockFlowFile> flowFiles = testRunner.getFlowFilesForRelationship(SegmentContent.REL_SEGMENTS);
assertEquals(3, flowFiles.size());
final MockFlowFile out1 = flowFiles.get(0);
@@ -54,17 +51,14 @@ public class TestSegmentContent {
@Test
public void testTransferSmall() throws IOException {
- final TestRunner testRunner = TestRunners.
- newTestRunner(new SegmentContent());
+ final TestRunner testRunner = TestRunners.newTestRunner(new SegmentContent());
testRunner.setProperty(SegmentContent.SIZE, "4 KB");
testRunner.enqueue(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9});
testRunner.run();
testRunner.assertTransferCount(SegmentContent.REL_SEGMENTS, 1);
- final MockFlowFile out1 = testRunner.
- getFlowFilesForRelationship(SegmentContent.REL_SEGMENTS).
- get(0);
+ final MockFlowFile out1 = testRunner.getFlowFilesForRelationship(SegmentContent.REL_SEGMENTS).get(0);
out1.assertContentEquals(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9});
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestServer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestServer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestServer.java
index b9c623e..7e5dd7b 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestServer.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestServer.java
@@ -44,8 +44,7 @@ public class TestServer {
/**
* Creates the test server.
*
- * @param sslProperties SSLProps to be used in the secure connection. The
- * keys should should use the StandardSSLContextService properties.
+ * @param sslProperties SSLProps to be used in the secure connection. The keys should should use the StandardSSLContextService properties.
*/
public TestServer(final Map<String, String> sslProperties) {
createServer(sslProperties);
@@ -78,21 +77,15 @@ public class TestServer {
SslContextFactory ssl = new SslContextFactory();
if (sslProperties.get(StandardSSLContextService.KEYSTORE.getName()) != null) {
- ssl.setKeyStorePath(sslProperties.
- get(StandardSSLContextService.KEYSTORE.getName()));
- ssl.setKeyStorePassword(sslProperties.
- get(StandardSSLContextService.KEYSTORE_PASSWORD.getName()));
- ssl.setKeyStoreType(sslProperties.
- get(StandardSSLContextService.KEYSTORE_TYPE.getName()));
+ ssl.setKeyStorePath(sslProperties.get(StandardSSLContextService.KEYSTORE.getName()));
+ ssl.setKeyStorePassword(sslProperties.get(StandardSSLContextService.KEYSTORE_PASSWORD.getName()));
+ ssl.setKeyStoreType(sslProperties.get(StandardSSLContextService.KEYSTORE_TYPE.getName()));
}
if (sslProperties.get(StandardSSLContextService.TRUSTSTORE.getName()) != null) {
- ssl.setTrustStorePath(sslProperties.
- get(StandardSSLContextService.TRUSTSTORE.getName()));
- ssl.setTrustStorePassword(sslProperties.
- get(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName()));
- ssl.setTrustStoreType(sslProperties.
- get(StandardSSLContextService.TRUSTSTORE_TYPE.getName()));
+ ssl.setTrustStorePath(sslProperties.get(StandardSSLContextService.TRUSTSTORE.getName()));
+ ssl.setTrustStorePassword(sslProperties.get(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName()));
+ ssl.setTrustStoreType(sslProperties.get(StandardSSLContextService.TRUSTSTORE_TYPE.getName()));
}
final String clientAuth = sslProperties.get(NEED_CLIENT_AUTH);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitContent.java
index ea3da22..6d9fba9 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitContent.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitContent.java
@@ -16,8 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import org.apache.nifi.processors.standard.MergeContent;
-import org.apache.nifi.processors.standard.SplitContent;
import java.io.IOException;
import java.util.List;
@@ -32,13 +30,10 @@ public class TestSplitContent {
@Test
public void testTextFormatLeadingPosition() {
final TestRunner runner = TestRunners.newTestRunner(new SplitContent());
- runner.setProperty(SplitContent.FORMAT, SplitContent.UTF8_FORMAT.
- getValue());
+ runner.setProperty(SplitContent.FORMAT, SplitContent.UTF8_FORMAT.getValue());
runner.setProperty(SplitContent.BYTE_SEQUENCE, "ub");
runner.setProperty(SplitContent.KEEP_SEQUENCE, "true");
- runner.
- setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.LEADING_POSITION.
- getValue());
+ runner.setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.LEADING_POSITION.getValue());
runner.enqueue("rub-a-dub-dub".getBytes());
runner.run();
@@ -47,31 +42,22 @@ public class TestSplitContent {
runner.assertTransferCount(SplitContent.REL_SPLITS, 4);
runner.assertQueueEmpty();
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
- splits.get(0).
- assertContentEquals("r");
- splits.get(1).
- assertContentEquals("ub-a-d");
- splits.get(2).
- assertContentEquals("ub-d");
- splits.get(3).
- assertContentEquals("ub");
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ splits.get(0).assertContentEquals("r");
+ splits.get(1).assertContentEquals("ub-a-d");
+ splits.get(2).assertContentEquals("ub-d");
+ splits.get(3).assertContentEquals("ub");
}
@Test
public void testTextFormatSplits() {
final TestRunner runner = TestRunners.newTestRunner(new SplitContent());
- runner.setProperty(SplitContent.FORMAT, SplitContent.UTF8_FORMAT.
- getValue());
+ runner.setProperty(SplitContent.FORMAT, SplitContent.UTF8_FORMAT.getValue());
runner.setProperty(SplitContent.BYTE_SEQUENCE, "test");
runner.setProperty(SplitContent.KEEP_SEQUENCE, "true");
- runner.
- setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.LEADING_POSITION.
- getValue());
+ runner.setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.LEADING_POSITION.getValue());
- final byte[] input = "This is a test. This is another test. And this is yet another test. Finally this is the last Test.".
- getBytes();
+ final byte[] input = "This is a test. This is another test. And this is yet another test. Finally this is the last Test.".getBytes();
runner.enqueue(input);
runner.run();
@@ -79,16 +65,11 @@ public class TestSplitContent {
runner.assertTransferCount(SplitContent.REL_SPLITS, 4);
runner.assertQueueEmpty();
- List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
- splits.get(0).
- assertContentEquals("This is a ");
- splits.get(1).
- assertContentEquals("test. This is another ");
- splits.get(2).
- assertContentEquals("test. And this is yet another ");
- splits.get(3).
- assertContentEquals("test. Finally this is the last Test.");
+ List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ splits.get(0).assertContentEquals("This is a ");
+ splits.get(1).assertContentEquals("test. This is another ");
+ splits.get(2).assertContentEquals("test. And this is yet another ");
+ splits.get(3).assertContentEquals("test. Finally this is the last Test.");
runner.clearTransferState();
runner.setProperty(SplitContent.KEEP_SEQUENCE, "false");
@@ -97,77 +78,50 @@ public class TestSplitContent {
runner.assertTransferCount(SplitContent.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitContent.REL_SPLITS, 4);
splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
- splits.get(0).
- assertContentEquals("This is a ");
- splits.get(1).
- assertContentEquals(". This is another ");
- splits.get(2).
- assertContentEquals(". And this is yet another ");
- splits.get(3).
- assertContentEquals(". Finally this is the last Test.");
+ splits.get(0).assertContentEquals("This is a ");
+ splits.get(1).assertContentEquals(". This is another ");
+ splits.get(2).assertContentEquals(". And this is yet another ");
+ splits.get(3).assertContentEquals(". Finally this is the last Test.");
runner.clearTransferState();
runner.setProperty(SplitContent.KEEP_SEQUENCE, "true");
- runner.
- setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.TRAILING_POSITION.
- getValue());
+ runner.setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.TRAILING_POSITION.getValue());
runner.enqueue(input);
runner.run();
runner.assertTransferCount(SplitContent.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitContent.REL_SPLITS, 4);
splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
- splits.get(0).
- assertContentEquals("This is a test");
- splits.get(1).
- assertContentEquals(". This is another test");
- splits.get(2).
- assertContentEquals(". And this is yet another test");
- splits.get(3).
- assertContentEquals(". Finally this is the last Test.");
+ splits.get(0).assertContentEquals("This is a test");
+ splits.get(1).assertContentEquals(". This is another test");
+ splits.get(2).assertContentEquals(". And this is yet another test");
+ splits.get(3).assertContentEquals(". Finally this is the last Test.");
runner.clearTransferState();
runner.setProperty(SplitContent.KEEP_SEQUENCE, "true");
- runner.
- setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.TRAILING_POSITION.
- getValue());
- runner.
- enqueue("This is a test. This is another test. And this is yet another test. Finally this is the last test".
- getBytes());
+ runner.setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.TRAILING_POSITION.getValue());
+ runner.enqueue("This is a test. This is another test. And this is yet another test. Finally this is the last test".getBytes());
runner.run();
runner.assertTransferCount(SplitContent.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitContent.REL_SPLITS, 4);
splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
- splits.get(0).
- assertContentEquals("This is a test");
- splits.get(1).
- assertContentEquals(". This is another test");
- splits.get(2).
- assertContentEquals(". And this is yet another test");
- splits.get(3).
- assertContentEquals(". Finally this is the last test");
+ splits.get(0).assertContentEquals("This is a test");
+ splits.get(1).assertContentEquals(". This is another test");
+ splits.get(2).assertContentEquals(". And this is yet another test");
+ splits.get(3).assertContentEquals(". Finally this is the last test");
runner.clearTransferState();
runner.setProperty(SplitContent.KEEP_SEQUENCE, "true");
- runner.
- setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.LEADING_POSITION.
- getValue());
- runner.
- enqueue("This is a test. This is another test. And this is yet another test. Finally this is the last test".
- getBytes());
+ runner.setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.LEADING_POSITION.getValue());
+ runner.enqueue("This is a test. This is another test. And this is yet another test. Finally this is the last test".getBytes());
runner.run();
runner.assertTransferCount(SplitContent.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitContent.REL_SPLITS, 5);
splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
- splits.get(0).
- assertContentEquals("This is a ");
- splits.get(1).
- assertContentEquals("test. This is another ");
- splits.get(2).
- assertContentEquals("test. And this is yet another ");
- splits.get(3).
- assertContentEquals("test. Finally this is the last ");
- splits.get(4).
- assertContentEquals("test");
+ splits.get(0).assertContentEquals("This is a ");
+ splits.get(1).assertContentEquals("test. This is another ");
+ splits.get(2).assertContentEquals("test. And this is yet another ");
+ splits.get(3).assertContentEquals("test. Finally this is the last ");
+ splits.get(4).assertContentEquals("test");
runner.clearTransferState();
}
@@ -175,13 +129,10 @@ public class TestSplitContent {
@Test
public void testTextFormatTrailingPosition() {
final TestRunner runner = TestRunners.newTestRunner(new SplitContent());
- runner.setProperty(SplitContent.FORMAT, SplitContent.UTF8_FORMAT.
- getValue());
+ runner.setProperty(SplitContent.FORMAT, SplitContent.UTF8_FORMAT.getValue());
runner.setProperty(SplitContent.BYTE_SEQUENCE, "ub");
runner.setProperty(SplitContent.KEEP_SEQUENCE, "true");
- runner.
- setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.TRAILING_POSITION.
- getValue());
+ runner.setProperty(SplitContent.BYTE_SEQUENCE_LOCATION, SplitContent.TRAILING_POSITION.getValue());
runner.enqueue("rub-a-dub-dub".getBytes());
runner.run();
@@ -190,14 +141,10 @@ public class TestSplitContent {
runner.assertTransferCount(SplitContent.REL_SPLITS, 3);
runner.assertQueueEmpty();
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
- splits.get(0).
- assertContentEquals("rub");
- splits.get(1).
- assertContentEquals("-a-dub");
- splits.get(2).
- assertContentEquals("-dub");
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ splits.get(0).assertContentEquals("rub");
+ splits.get(1).assertContentEquals("-a-dub");
+ splits.get(2).assertContentEquals("-dub");
}
@Test
@@ -206,16 +153,14 @@ public class TestSplitContent {
runner.setProperty(SplitContent.KEEP_SEQUENCE, "false");
runner.setProperty(SplitContent.BYTE_SEQUENCE.getName(), "FFFF");
- runner.
- enqueue(new byte[]{1, 2, 3, 4, 5, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, 5, 4, 3, 2, 1});
+ runner.enqueue(new byte[]{1, 2, 3, 4, 5, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, 5, 4, 3, 2, 1});
runner.run();
runner.assertTransferCount(SplitContent.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitContent.REL_SPLITS, 2);
runner.assertQueueEmpty();
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
final MockFlowFile split1 = splits.get(0);
final MockFlowFile split2 = splits.get(1);
@@ -236,8 +181,7 @@ public class TestSplitContent {
runner.assertTransferCount(SplitContent.REL_SPLITS, 2);
runner.assertQueueEmpty();
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
final MockFlowFile split1 = splits.get(0);
final MockFlowFile split2 = splits.get(1);
@@ -261,8 +205,7 @@ public class TestSplitContent {
runner.assertTransferCount(SplitContent.REL_SPLITS, 2);
runner.assertQueueEmpty();
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
final MockFlowFile split1 = splits.get(0);
final MockFlowFile split2 = splits.get(1);
@@ -287,8 +230,7 @@ public class TestSplitContent {
runner.assertTransferCount(SplitContent.REL_SPLITS, 2);
runner.assertQueueEmpty();
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
final MockFlowFile split1 = splits.get(0);
final MockFlowFile split2 = splits.get(1);
@@ -310,8 +252,7 @@ public class TestSplitContent {
runner.assertTransferCount(SplitContent.REL_SPLITS, 1);
runner.assertQueueEmpty();
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
final MockFlowFile split1 = splits.get(0);
split1.assertContentEquals(new byte[]{1, 2, 3, 4});
@@ -331,8 +272,7 @@ public class TestSplitContent {
runner.assertTransferCount(SplitContent.REL_SPLITS, 1);
runner.assertQueueEmpty();
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
final MockFlowFile split1 = splits.get(0);
split1.assertContentEquals(new byte[]{1, 2, 3, 4, 5, 5, 5, 5});
@@ -352,8 +292,7 @@ public class TestSplitContent {
runner.assertTransferCount(SplitContent.REL_SPLITS, 1);
runner.assertQueueEmpty();
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
final MockFlowFile split1 = splits.get(0);
split1.assertContentEquals(new byte[]{1, 2, 3, 4});
@@ -373,12 +312,9 @@ public class TestSplitContent {
runner.assertTransferCount(SplitContent.REL_SPLITS, 2);
runner.assertQueueEmpty();
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
- splits.get(0).
- assertContentEquals(new byte[]{5, 5, 5, 5});
- splits.get(1).
- assertContentEquals(new byte[]{1, 2, 3, 4});
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ splits.get(0).assertContentEquals(new byte[]{5, 5, 5, 5});
+ splits.get(1).assertContentEquals(new byte[]{1, 2, 3, 4});
}
@Test
@@ -387,29 +323,23 @@ public class TestSplitContent {
runner.setProperty(SplitContent.KEEP_SEQUENCE, "true");
runner.setProperty(SplitContent.BYTE_SEQUENCE.getName(), "FFFF");
- runner.
- enqueue(new byte[]{1, 2, 3, 4, 5, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, 5, 4, 3, 2, 1});
+ runner.enqueue(new byte[]{1, 2, 3, 4, 5, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, 5, 4, 3, 2, 1});
runner.run();
runner.assertTransferCount(SplitContent.REL_ORIGINAL, 1);
runner.assertTransferCount(SplitContent.REL_SPLITS, 2);
runner.assertQueueEmpty();
- final List<MockFlowFile> splits = runner.
- getFlowFilesForRelationship(SplitContent.REL_SPLITS);
+ final List<MockFlowFile> splits = runner.getFlowFilesForRelationship(SplitContent.REL_SPLITS);
final MockFlowFile split1 = splits.get(0);
final MockFlowFile split2 = splits.get(1);
- split1.
- assertContentEquals(new byte[]{1, 2, 3, 4, 5, (byte) 0xFF, (byte) 0xFF});
+ split1.assertContentEquals(new byte[]{1, 2, 3, 4, 5, (byte) 0xFF, (byte) 0xFF});
split2.assertContentEquals(new byte[]{(byte) 0xFF, 5, 4, 3, 2, 1});
- final TestRunner mergeRunner = TestRunners.
- newTestRunner(new MergeContent());
- mergeRunner.
- setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
- mergeRunner.
- setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
+ final TestRunner mergeRunner = TestRunners.newTestRunner(new MergeContent());
+ mergeRunner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT);
+ mergeRunner.setProperty(MergeContent.MERGE_STRATEGY, MergeContent.MERGE_STRATEGY_DEFRAGMENT);
mergeRunner.enqueue(splits.toArray(new MockFlowFile[0]));
mergeRunner.run();
@@ -417,9 +347,7 @@ public class TestSplitContent {
mergeRunner.assertTransferCount(MergeContent.REL_ORIGINAL, 2);
mergeRunner.assertTransferCount(MergeContent.REL_FAILURE, 0);
- final List<MockFlowFile> packed = mergeRunner.
- getFlowFilesForRelationship(MergeContent.REL_MERGED);
- packed.get(0).
- assertContentEquals(new byte[]{1, 2, 3, 4, 5, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, 5, 4, 3, 2, 1});
+ final List<MockFlowFile> packed = mergeRunner.getFlowFilesForRelationship(MergeContent.REL_MERGED);
+ packed.get(0).assertContentEquals(new byte[]{1, 2, 3, 4, 5, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, 5, 4, 3, 2, 1});
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitJson.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitJson.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitJson.java
index 9503182..fc07386 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitJson.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitJson.java
@@ -35,18 +35,15 @@ import java.nio.file.Paths;
public class TestSplitJson {
- private static final Path JSON_SNIPPET = Paths.
- get("src/test/resources/TestJson/json-sample.json");
- private static final Path XML_SNIPPET = Paths.
- get("src/test/resources/TestXml/xml-snippet.xml");
+ private static final Path JSON_SNIPPET = Paths.get("src/test/resources/TestJson/json-sample.json");
+ private static final Path XML_SNIPPET = Paths.get("src/test/resources/TestXml/xml-snippet.xml");
@Test(expected = AssertionError.class)
public void testInvalidJsonPath() {
final TestRunner testRunner = TestRunners.newTestRunner(new SplitJson());
testRunner.setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$..");
- Assert.
- fail("An improper JsonPath expression was not detected as being invalid.");
+ Assert.fail("An improper JsonPath expression was not detected as being invalid.");
}
@Test
@@ -58,9 +55,7 @@ public class TestSplitJson {
testRunner.run();
testRunner.assertAllFlowFilesTransferred(SplitJson.REL_FAILURE, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(SplitJson.REL_FAILURE).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(SplitJson.REL_FAILURE).get(0);
// Verify that the content was unchanged
out.assertContentEquals(XML_SNIPPET);
}
@@ -76,36 +71,28 @@ public class TestSplitJson {
Relationship expectedRel = SplitJson.REL_FAILURE;
testRunner.assertAllFlowFilesTransferred(expectedRel, 1);
- final MockFlowFile out = testRunner.
- getFlowFilesForRelationship(expectedRel).
- get(0);
+ final MockFlowFile out = testRunner.getFlowFilesForRelationship(expectedRel).get(0);
out.assertContentEquals(JSON_SNIPPET);
}
@Test
public void testSplit_arrayResult_oneValue() throws Exception {
final TestRunner testRunner = TestRunners.newTestRunner(new SplitJson());
- testRunner.
- setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$[0].range[?(@ == 0)]");
+ testRunner.setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$[0].range[?(@ == 0)]");
testRunner.enqueue(JSON_SNIPPET);
testRunner.run();
testRunner.assertTransferCount(SplitJson.REL_ORIGINAL, 1);
testRunner.assertTransferCount(SplitJson.REL_SPLIT, 1);
- testRunner.getFlowFilesForRelationship(SplitJson.REL_ORIGINAL).
- get(0).
- assertContentEquals(JSON_SNIPPET);
- testRunner.getFlowFilesForRelationship(SplitJson.REL_SPLIT).
- get(0).
- assertContentEquals("0");
+ testRunner.getFlowFilesForRelationship(SplitJson.REL_ORIGINAL).get(0).assertContentEquals(JSON_SNIPPET);
+ testRunner.getFlowFilesForRelationship(SplitJson.REL_SPLIT).get(0).assertContentEquals("0");
}
@Test
public void testSplit_arrayResult_multipleValues() throws Exception {
final TestRunner testRunner = TestRunners.newTestRunner(new SplitJson());
- testRunner.
- setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$[0].range");
+ testRunner.setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$[0].range");
testRunner.enqueue(JSON_SNIPPET);
testRunner.run();
@@ -114,63 +101,49 @@ public class TestSplitJson {
testRunner.assertTransferCount(SplitJson.REL_ORIGINAL, 1);
testRunner.assertTransferCount(SplitJson.REL_SPLIT, numSplitsExpected);
- final MockFlowFile originalOut = testRunner.
- getFlowFilesForRelationship(SplitJson.REL_ORIGINAL).
- get(0);
+ final MockFlowFile originalOut = testRunner.getFlowFilesForRelationship(SplitJson.REL_ORIGINAL).get(0);
originalOut.assertContentEquals(JSON_SNIPPET);
}
@Test
public void testSplit_arrayResult_nonScalarValues() throws Exception {
final TestRunner testRunner = TestRunners.newTestRunner(new SplitJson());
- testRunner.
- setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$[*].name");
+ testRunner.setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$[*].name");
testRunner.enqueue(JSON_SNIPPET);
testRunner.run();
testRunner.assertTransferCount(SplitJson.REL_ORIGINAL, 1);
testRunner.assertTransferCount(SplitJson.REL_SPLIT, 7);
- testRunner.getFlowFilesForRelationship(SplitJson.REL_ORIGINAL).
- get(0).
- assertContentEquals(JSON_SNIPPET);
- testRunner.getFlowFilesForRelationship(SplitJson.REL_SPLIT).
- get(0).
- assertContentEquals("{\"first\":\"Shaffer\",\"last\":\"Pearson\"}");
+ testRunner.getFlowFilesForRelationship(SplitJson.REL_ORIGINAL).get(0).assertContentEquals(JSON_SNIPPET);
+ testRunner.getFlowFilesForRelationship(SplitJson.REL_SPLIT).get(0).assertContentEquals("{\"first\":\"Shaffer\",\"last\":\"Pearson\"}");
}
@Test
public void testSplit_pathNotFound() throws Exception {
final TestRunner testRunner = TestRunners.newTestRunner(new SplitJson());
- testRunner.
- setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$.nonexistent");
+ testRunner.setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$.nonexistent");
testRunner.enqueue(JSON_SNIPPET);
testRunner.run();
testRunner.assertTransferCount(SplitJson.REL_FAILURE, 1);
- testRunner.getFlowFilesForRelationship(SplitJson.REL_FAILURE).
- get(0).
- assertContentEquals(JSON_SNIPPET);
+ testRunner.getFlowFilesForRelationship(SplitJson.REL_FAILURE).get(0).assertContentEquals(JSON_SNIPPET);
}
@Test
public void testSplit_pathToNullValue() throws Exception {
final TestRunner testRunner = TestRunners.newTestRunner(new SplitJson());
- testRunner.
- setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$.nullField");
+ testRunner.setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$.nullField");
- ProcessSession session = testRunner.getProcessSessionFactory().
- createSession();
+ ProcessSession session = testRunner.getProcessSessionFactory().createSession();
FlowFile ff = session.create();
ff = session.write(ff, new OutputStreamCallback() {
@Override
public void process(OutputStream out) throws IOException {
try (OutputStream outputStream = new BufferedOutputStream(out)) {
- outputStream.
- write("{\"stringField\": \"String Value\", \"nullField\": null}".
- getBytes(StandardCharsets.UTF_8));
+ outputStream.write("{\"stringField\": \"String Value\", \"nullField\": null}".getBytes(StandardCharsets.UTF_8));
}
}
});
@@ -184,20 +157,16 @@ public class TestSplitJson {
@Test
public void testSplit_pathToArrayWithNulls_emptyStringRepresentation() throws Exception {
final TestRunner testRunner = TestRunners.newTestRunner(new SplitJson());
- testRunner.
- setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$.arrayOfNulls");
+ testRunner.setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$.arrayOfNulls");
- ProcessSession session = testRunner.getProcessSessionFactory().
- createSession();
+ ProcessSession session = testRunner.getProcessSessionFactory().createSession();
FlowFile ff = session.create();
ff = session.write(ff, new OutputStreamCallback() {
@Override
public void process(OutputStream out) throws IOException {
try (OutputStream outputStream = new BufferedOutputStream(out)) {
- outputStream.
- write("{\"stringField\": \"String Value\", \"arrayOfNulls\": [null, null, null]}".
- getBytes(StandardCharsets.UTF_8));
+ outputStream.write("{\"stringField\": \"String Value\", \"arrayOfNulls\": [null, null, null]}".getBytes(StandardCharsets.UTF_8));
}
}
});
@@ -209,31 +178,25 @@ public class TestSplitJson {
int expectedFiles = 3;
testRunner.assertTransferCount(SplitJson.REL_SPLIT, expectedFiles);
for (int i = 0; i < expectedFiles; i++) {
- testRunner.getFlowFilesForRelationship(SplitJson.REL_SPLIT).
- get(i).
- assertContentEquals("");
+ testRunner.getFlowFilesForRelationship(SplitJson.REL_SPLIT).get(i).assertContentEquals("");
}
}
@Test
public void testSplit_pathToArrayWithNulls_nullStringRepresentation() throws Exception {
final TestRunner testRunner = TestRunners.newTestRunner(new SplitJson());
- testRunner.
- setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$.arrayOfNulls");
+ testRunner.setProperty(SplitJson.ARRAY_JSON_PATH_EXPRESSION, "$.arrayOfNulls");
testRunner.setProperty(SplitJson.NULL_VALUE_DEFAULT_REPRESENTATION,
AbstractJsonPathProcessor.NULL_STRING_OPTION);
- ProcessSession session = testRunner.getProcessSessionFactory().
- createSession();
+ ProcessSession session = testRunner.getProcessSessionFactory().createSession();
FlowFile ff = session.create();
ff = session.write(ff, new OutputStreamCallback() {
@Override
public void process(OutputStream out) throws IOException {
try (OutputStream outputStream = new BufferedOutputStream(out)) {
- outputStream.
- write("{\"stringField\": \"String Value\", \"arrayOfNulls\": [null, null, null]}".
- getBytes(StandardCharsets.UTF_8));
+ outputStream.write("{\"stringField\": \"String Value\", \"arrayOfNulls\": [null, null, null]}".getBytes(StandardCharsets.UTF_8));
}
}
});
@@ -245,9 +208,7 @@ public class TestSplitJson {
int expectedFiles = 3;
testRunner.assertTransferCount(SplitJson.REL_SPLIT, expectedFiles);
for (int i = 0; i < expectedFiles; i++) {
- testRunner.getFlowFilesForRelationship(SplitJson.REL_SPLIT).
- get(i).
- assertContentEquals("null");
+ testRunner.getFlowFilesForRelationship(SplitJson.REL_SPLIT).get(i).assertContentEquals("null");
}
}
}
[12/12] incubator-nifi git commit: NIFI-271
Posted by jo...@apache.org.
NIFI-271
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d29a2d68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d29a2d68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d29a2d68
Branch: refs/heads/develop
Commit: d29a2d688e437bae42c12115768cdb038b7406c5
Parents: 5481889
Author: joewitt <jo...@apache.org>
Authored: Mon Apr 27 11:54:36 2015 -0400
Committer: joewitt <jo...@apache.org>
Committed: Mon Apr 27 11:54:36 2015 -0400
----------------------------------------------------------------------
.../standard/AbstractJsonPathProcessor.java | 11 +-
.../standard/ConvertCharacterSet.java | 2 +-
.../nifi/processors/standard/HashAttribute.java | 34 +-
.../nifi/processors/standard/PutEmail.java | 302 +++++++---------
.../apache/nifi/processors/standard/PutFTP.java | 24 +-
.../nifi/processors/standard/PutFile.java | 275 ++++++--------
.../processors/standard/PutFileTransfer.java | 140 +++-----
.../apache/nifi/processors/standard/PutJMS.java | 161 +++------
.../nifi/processors/standard/ReplaceText.java | 169 ++++-----
.../standard/ReplaceTextWithMapping.java | 231 +++++-------
.../processors/standard/RouteOnAttribute.java | 136 +++----
.../processors/standard/RouteOnContent.java | 147 +++-----
.../nifi/processors/standard/ScanAttribute.java | 121 +++----
.../nifi/processors/standard/ScanContent.java | 86 ++---
.../processors/standard/SegmentContent.java | 54 ++-
.../nifi/processors/standard/SplitContent.java | 125 +++----
.../nifi/processors/standard/SplitJson.java | 77 ++--
.../nifi/processors/standard/SplitText.java | 142 ++++----
.../nifi/processors/standard/SplitXml.java | 70 ++--
.../nifi/processors/standard/TransformXml.java | 87 ++---
.../nifi/processors/standard/UnpackContent.java | 215 +++++------
.../servlets/ContentAcknowledgmentServlet.java | 55 +--
.../standard/servlets/ListenHTTPServlet.java | 142 +++-----
.../nifi/processors/standard/util/Bin.java | 22 +-
.../processors/standard/util/BinManager.java | 41 +--
.../standard/util/DocumentReaderCallback.java | 6 +-
.../processors/standard/util/FTPTransfer.java | 351 +++++++-----------
.../nifi/processors/standard/util/FTPUtils.java | 95 ++---
.../nifi/processors/standard/util/FileInfo.java | 3 +-
.../processors/standard/util/FileTransfer.java | 356 +++++++++----------
.../processors/standard/util/JmsFactory.java | 128 +++----
.../processors/standard/util/JmsProperties.java | 256 ++++++-------
.../util/JsonPathExpressionValidator.java | 27 +-
.../standard/util/NLKBufferedReader.java | 14 +-
.../processors/standard/util/SFTPTransfer.java | 351 +++++++-----------
.../processors/standard/util/SFTPUtils.java | 167 ++++-----
.../standard/util/UDPStreamConsumer.java | 25 +-
.../util/ValidatingBase32InputStream.java | 3 +-
.../util/ValidatingBase64InputStream.java | 3 +-
.../standard/util/WrappedMessageConsumer.java | 9 +-
.../standard/util/WrappedMessageProducer.java | 9 +-
.../src/test/java/TestIngestAndUpdate.java | 3 +-
.../processors/standard/CaptureServlet.java | 3 +-
.../standard/RESTServiceContentModified.java | 15 +-
.../standard/TestBase64EncodeContent.java | 42 +--
.../standard/TestCompressContent.java | 85 ++---
.../processors/standard/TestControlRate.java | 3 +-
.../standard/TestConvertCharacterSet.java | 13 +-
.../standard/TestDetectDuplicate.java | 33 +-
.../processors/standard/TestDistributeLoad.java | 19 +-
.../processors/standard/TestEncodeContent.java | 66 ++--
.../processors/standard/TestEncryptContent.java | 30 +-
.../standard/TestEvaluateJsonPath.java | 219 ++++--------
.../processors/standard/TestEvaluateXPath.java | 106 ++----
.../processors/standard/TestEvaluateXQuery.java | 312 +++++-----------
.../processors/standard/TestExecuteProcess.java | 18 +-
.../standard/TestExecuteStreamCommand.java | 135 +++----
.../processors/standard/TestExtractText.java | 81 ++---
.../nifi/processors/standard/TestGetFile.java | 63 ++--
.../nifi/processors/standard/TestGetHTTP.java | 57 +--
.../processors/standard/TestGetJMSQueue.java | 63 ++--
.../standard/TestHandleHttpRequest.java | 19 +-
.../standard/TestHandleHttpResponse.java | 81 ++---
.../processors/standard/TestHashAttribute.java | 8 +-
.../processors/standard/TestHashContent.java | 5 +-
.../standard/TestIdentifyMimeType.java | 16 +-
.../processors/standard/TestInvokeHTTP.java | 137 ++-----
.../processors/standard/TestJmsConsumer.java | 88 ++---
.../nifi/processors/standard/TestListenUDP.java | 39 +-
.../processors/standard/TestMergeContent.java | 176 +++------
.../processors/standard/TestModifyBytes.java | 82 ++---
.../standard/TestMonitorActivity.java | 84 ++---
.../nifi/processors/standard/TestPostHTTP.java | 102 ++----
.../nifi/processors/standard/TestPutEmail.java | 17 +-
.../processors/standard/TestReplaceText.java | 81 ++---
.../standard/TestReplaceTextLineByLine.java | 204 ++++-------
.../standard/TestReplaceTextWithMapping.java | 316 +++++-----------
.../standard/TestRouteOnAttribute.java | 65 ++--
.../processors/standard/TestRouteOnContent.java | 19 +-
.../processors/standard/TestScanAttribute.java | 16 +-
.../processors/standard/TestScanContent.java | 34 +-
.../processors/standard/TestSegmentContent.java | 14 +-
.../nifi/processors/standard/TestServer.java | 21 +-
.../processors/standard/TestSplitContent.java | 196 ++++------
.../nifi/processors/standard/TestSplitJson.java | 91 ++---
.../nifi/processors/standard/TestSplitText.java | 80 ++---
.../nifi/processors/standard/TestSplitXml.java | 4 +-
.../processors/standard/TestTransformXml.java | 45 +--
.../processors/standard/TestUnpackContent.java | 131 +++----
.../processors/standard/TestValidateXml.java | 4 +-
.../standard/UserAgentTestingServlet.java | 1 -
91 files changed, 2933 insertions(+), 5281 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
index 9e77dab..d03240e 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractJsonPathProcessor.java
@@ -42,8 +42,7 @@ import java.util.Map;
import java.util.Objects;
/**
- * Provides common functionality used for processors interacting and
- * manipulating JSON data via JsonPath.
+ * Provides common functionality used for processors interacting and manipulating JSON data via JsonPath.
*
* @see <a href="http://json.org">http://json.org</a>
* @see
@@ -90,9 +89,8 @@ public abstract class AbstractJsonPathProcessor extends AbstractProcessor {
}
/**
- * Determines the context by which JsonSmartJsonProvider would treat the
- * value. {@link java.util.Map} and {@link java.util.List} objects can be
- * rendered as JSON elements, everything else is treated as a scalar.
+ * Determines the context by which JsonSmartJsonProvider would treat the value. {@link java.util.Map} and {@link java.util.List} objects can be rendered as JSON elements, everything else is
+ * treated as a scalar.
*
* @param obj item to be inspected if it is a scalar or a JSON element
* @return false, if the object is a supported type; true otherwise
@@ -131,8 +129,7 @@ public abstract class AbstractJsonPathProcessor extends AbstractProcessor {
abstract void cacheComputedValue(String subject, String input, JsonPath computedJsonPath);
/**
- * A hook for implementing classes to determine if a cached value is
- * stale for a compiled JsonPath represented by either a validation
+ * A hook for implementing classes to determine if a cached value is stale for a compiled JsonPath represented by either a validation
*/
abstract boolean isStale(String subject, String input);
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
index c8d22d3..ec61370 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java
@@ -159,7 +159,7 @@ public class ConvertCharacterSet extends AbstractProcessor {
});
session.getProvenanceReporter().modifyContent(flowFile, stopWatch.getElapsed(TimeUnit.MILLISECONDS));
- logger.info("successfully converted characters from {} to {} for {}",
+ logger.info("successfully converted characters from {} to {} for {}",
new Object[]{context.getProperty(INPUT_CHARSET).getValue(), context.getProperty(OUTPUT_CHARSET).getValue(), flowFile});
session.transfer(flowFile, REL_SUCCESS);
} catch (final Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
index 9187aad..314f1c7 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java
@@ -50,30 +50,21 @@ import org.apache.nifi.processor.util.StandardValidators;
/**
* <p>
- * This processor identifies groups of user-specified flowfile attributes and
- * assigns a unique hash value to each group, recording this hash value in the
- * flowfile's attributes using a user-specified attribute key. The groups are
- * identified dynamically and preserved across application restarts. </p>
+ * This processor identifies groups of user-specified flowfile attributes and assigns a unique hash value to each group, recording this hash value in the flowfile's attributes using a user-specified
+ * attribute key. The groups are identified dynamically and preserved across application restarts. </p>
*
* <p>
- * The user must supply optional processor properties during runtime to
- * correctly configure this processor. The optional property key will be used as
- * the flowfile attribute key for attribute inspection. The value must be a
- * valid regular expression. This regular expression is evaluated against the
- * flowfile attribute values. If the regular expression contains a capturing
- * group, the value of that group will be used when comparing flow file
- * attributes. Otherwise, the original flow file attribute's value will be used
- * if and only if the value matches the given regular expression. </p>
+ * The user must supply optional processor properties during runtime to correctly configure this processor. The optional property key will be used as the flowfile attribute key for attribute
+ * inspection. The value must be a valid regular expression. This regular expression is evaluated against the flowfile attribute values. If the regular expression contains a capturing group, the value
+ * of that group will be used when comparing flow file attributes. Otherwise, the original flow file attribute's value will be used if and only if the value matches the given regular expression. </p>
*
* <p>
- * If a flowfile does not have an attribute entry for one or more processor
- * configured values, then the flowfile is routed to failure. </p>
+ * If a flowfile does not have an attribute entry for one or more processor configured values, then the flowfile is routed to failure. </p>
*
* <p>
* An example hash value identification:
*
- * Assume Processor Configured with Two Properties ("MDKey1" = ".*" and "MDKey2"
- * = "(.).*").
+ * Assume Processor Configured with Two Properties ("MDKey1" = ".*" and "MDKey2" = "(.).*").
*
* FlowFile 1 has the following attributes: MDKey1 = a MDKey2 = b
*
@@ -89,17 +80,12 @@ import org.apache.nifi.processor.util.StandardValidators;
*
* FlowFile 4 has the following attribute: MDKey1 = a MDKey2 = bad
*
- * and will be assigned to group 1 (because the value of MDKey1 has the regular
- * expression ".*" applied to it, and that evaluates to the same as MDKey1
- * attribute of the first flow file. Similarly, the capturing group for the
- * MDKey2 property indicates that only the first character of the MDKey2
- * attribute must match, and the first character of MDKey2 for Flow File 1 and
- * Flow File 4 are both 'b'.)
+ * and will be assigned to group 1 (because the value of MDKey1 has the regular expression ".*" applied to it, and that evaluates to the same as MDKey1 attribute of the first flow file. Similarly, the
+ * capturing group for the MDKey2 property indicates that only the first character of the MDKey2 attribute must match, and the first character of MDKey2 for Flow File 1 and Flow File 4 are both 'b'.)
*
* FlowFile 5 has the following attributes: MDKey1 = a
*
- * and will route to failure because it does not have MDKey2 entry in its
- * attribute
+ * and will route to failure because it does not have MDKey2 entry in its attribute
* </p>
*
* <p>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
index 8cad06f..8efc563 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java
@@ -124,96 +124,95 @@ public class PutEmail extends AbstractProcessor {
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.defaultValue("javax.net.ssl.SSLSocketFactory")
.build();
- public static final PropertyDescriptor HEADER_XMAILER = new PropertyDescriptor.Builder().
- name("SMTP X-Mailer Header").
- description("X-Mailer used in the header of the outgoing email").
- required(true).
- expressionLanguageSupported(true).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- defaultValue("NiFi").
- build();
- public static final PropertyDescriptor CONTENT_TYPE = new PropertyDescriptor.Builder().
- name("Content Type").
- description("Mime Type used to interpret the contents of the email, such as text/plain or text/html").
- required(true).
- expressionLanguageSupported(true).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- defaultValue("text/plain").
- build();
- public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder().
- name("From").
- description("Specifies the Email address to use as the sender").
- required(true).
- expressionLanguageSupported(true).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- build();
+ public static final PropertyDescriptor HEADER_XMAILER = new PropertyDescriptor.Builder()
+ .name("SMTP X-Mailer Header")
+ .description("X-Mailer used in the header of the outgoing email")
+ .required(true)
+ .expressionLanguageSupported(true)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .defaultValue("NiFi")
+ .build();
+ public static final PropertyDescriptor CONTENT_TYPE = new PropertyDescriptor.Builder()
+ .name("Content Type")
+ .description("Mime Type used to interpret the contents of the email, such as text/plain or text/html")
+ .required(true)
+ .expressionLanguageSupported(true)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .defaultValue("text/plain")
+ .build();
+ public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder()
+ .name("From")
+ .description("Specifies the Email address to use as the sender")
+ .required(true)
+ .expressionLanguageSupported(true)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .build();
public static final PropertyDescriptor TO = new PropertyDescriptor.Builder()
- .name("To").
- description("The recipients to include in the To-Line of the email").
- required(false).
- expressionLanguageSupported(true).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- build();
+ .name("To")
+ .description("The recipients to include in the To-Line of the email")
+ .required(false)
+ .expressionLanguageSupported(true)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .build();
public static final PropertyDescriptor CC = new PropertyDescriptor.Builder()
- .name("CC").
- description("The recipients to include in the CC-Line of the email").
- required(false).
- expressionLanguageSupported(true).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- build();
- public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder().
- name("BCC").
- description("The recipients to include in the BCC-Line of the email").
- required(false).
- expressionLanguageSupported(true).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- build();
- public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder().
- name("Subject").
- description("The email subject").
- required(true).
- expressionLanguageSupported(true).
- defaultValue("Message from NiFi").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- build();
- public static final PropertyDescriptor MESSAGE = new PropertyDescriptor.Builder().
- name("Message").
- description("The body of the email message").
- required(true).
- expressionLanguageSupported(true).
- defaultValue("").
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- build();
- public static final PropertyDescriptor ATTACH_FILE = new PropertyDescriptor.Builder().
- name("Attach File").
- description("Specifies whether or not the FlowFile content should be attached to the email").
- required(true).
- allowableValues("true", "false").
- defaultValue("false").
- build();
- public static final PropertyDescriptor INCLUDE_ALL_ATTRIBUTES = new PropertyDescriptor.Builder().
- name("Include All Attributes In Message").
- description("Specifies whether or not all FlowFile attributes should be recorded in the body of the email message").
- required(true).
- allowableValues("true", "false").
- defaultValue("false").
- build();
-
- public static final Relationship REL_SUCCESS = new Relationship.Builder().
- name("success").
- description("FlowFiles that are successfully sent will be routed to this relationship").
- build();
- public static final Relationship REL_FAILURE = new Relationship.Builder().
- name("failure").
- description("FlowFiles that fail to send will be routed to this relationship").
- build();
+ .name("CC")
+ .description("The recipients to include in the CC-Line of the email")
+ .required(false)
+ .expressionLanguageSupported(true)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder()
+ .name("BCC")
+ .description("The recipients to include in the BCC-Line of the email")
+ .required(false)
+ .expressionLanguageSupported(true)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder()
+ .name("Subject")
+ .description("The email subject")
+ .required(true)
+ .expressionLanguageSupported(true)
+ .defaultValue("Message from NiFi")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor MESSAGE = new PropertyDescriptor.Builder()
+ .name("Message")
+ .description("The body of the email message")
+ .required(true)
+ .expressionLanguageSupported(true)
+ .defaultValue("")
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor ATTACH_FILE = new PropertyDescriptor.Builder()
+ .name("Attach File")
+ .description("Specifies whether or not the FlowFile content should be attached to the email")
+ .required(true)
+ .allowableValues("true", "false")
+ .defaultValue("false")
+ .build();
+ public static final PropertyDescriptor INCLUDE_ALL_ATTRIBUTES = new PropertyDescriptor.Builder()
+ .name("Include All Attributes In Message")
+ .description("Specifies whether or not all FlowFile attributes should be recorded in the body of the email message")
+ .required(true)
+ .allowableValues("true", "false")
+ .defaultValue("false")
+ .build();
+
+ public static final Relationship REL_SUCCESS = new Relationship.Builder()
+ .name("success")
+ .description("FlowFiles that are successfully sent will be routed to this relationship")
+ .build();
+ public static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("FlowFiles that fail to send will be routed to this relationship")
+ .build();
private List<PropertyDescriptor> properties;
private Set<Relationship> relationships;
/**
- * Mapping of the mail properties to the NiFi PropertyDescriptors that will
- * be evaluated at runtime
+ * Mapping of the mail properties to the NiFi PropertyDescriptors that will be evaluated at runtime
*/
private static final Map<String, PropertyDescriptor> propertyToContext = new HashMap<>();
@@ -221,8 +220,7 @@ public class PutEmail extends AbstractProcessor {
propertyToContext.put("mail.smtp.host", SMTP_HOSTNAME);
propertyToContext.put("mail.smtp.port", SMTP_PORT);
propertyToContext.put("mail.smtp.socketFactory.port", SMTP_PORT);
- propertyToContext.
- put("mail.smtp.socketFactory.class", SMTP_SOCKET_FACTORY);
+ propertyToContext.put("mail.smtp.socketFactory.class", SMTP_SOCKET_FACTORY);
propertyToContext.put("mail.smtp.auth", SMTP_AUTH);
propertyToContext.put("mail.smtp.starttls.enable", SMTP_TLS);
propertyToContext.put("mail.smtp.user", SMTP_USERNAME);
@@ -269,21 +267,15 @@ public class PutEmail extends AbstractProcessor {
@Override
protected Collection<ValidationResult> customValidate(final ValidationContext context) {
- final List<ValidationResult> errors = new ArrayList<>(super.
- customValidate(context));
+ final List<ValidationResult> errors = new ArrayList<>(super.customValidate(context));
- final String to = context.getProperty(TO).
- getValue();
- final String cc = context.getProperty(CC).
- getValue();
- final String bcc = context.getProperty(BCC).
- getValue();
+ final String to = context.getProperty(TO).getValue();
+ final String cc = context.getProperty(CC).getValue();
+ final String bcc = context.getProperty(BCC).getValue();
if (to == null && cc == null && bcc == null) {
errors.add(new ValidationResult.Builder().subject("To, CC, BCC").
- valid(false).
- explanation("Must specify at least one To/CC/BCC address").
- build());
+ valid(false).explanation("Must specify at least one To/CC/BCC address").build());
}
return errors;
@@ -296,8 +288,7 @@ public class PutEmail extends AbstractProcessor {
return;
}
- final Properties properties = this.
- getMailPropertiesFromFlowFile(context, flowFile);
+ final Properties properties = this.getMailPropertiesFromFlowFile(context, flowFile);
final Session mailSession = this.createMailSession(properties);
@@ -305,71 +296,46 @@ public class PutEmail extends AbstractProcessor {
final ProcessorLog logger = getLogger();
try {
- message.setFrom(InternetAddress.parse(context.getProperty(FROM).
- evaluateAttributeExpressions(flowFile).
- getValue())[0]);
-
- final InternetAddress[] toAddresses = toInetAddresses(context.
- getProperty(TO).
- evaluateAttributeExpressions(flowFile).
- getValue());
+ message.setFrom(InternetAddress.parse(context.getProperty(FROM).evaluateAttributeExpressions(flowFile).getValue())[0]);
+
+ final InternetAddress[] toAddresses = toInetAddresses(context.getProperty(TO).evaluateAttributeExpressions(flowFile).getValue());
message.setRecipients(RecipientType.TO, toAddresses);
- final InternetAddress[] ccAddresses = toInetAddresses(context.
- getProperty(CC).
- evaluateAttributeExpressions(flowFile).
- getValue());
+ final InternetAddress[] ccAddresses = toInetAddresses(context.getProperty(CC).evaluateAttributeExpressions(flowFile).getValue());
message.setRecipients(RecipientType.CC, ccAddresses);
- final InternetAddress[] bccAddresses = toInetAddresses(context.
- getProperty(BCC).
- evaluateAttributeExpressions(flowFile).
- getValue());
+ final InternetAddress[] bccAddresses = toInetAddresses(context.getProperty(BCC).evaluateAttributeExpressions(flowFile).getValue());
message.setRecipients(RecipientType.BCC, bccAddresses);
- message.setHeader("X-Mailer", context.getProperty(HEADER_XMAILER).
- evaluateAttributeExpressions(flowFile).
- getValue());
- message.setSubject(context.getProperty(SUBJECT).
- evaluateAttributeExpressions(flowFile).
- getValue());
- String messageText = context.getProperty(MESSAGE).
- evaluateAttributeExpressions(flowFile).
- getValue();
-
- if (context.getProperty(INCLUDE_ALL_ATTRIBUTES).
- asBoolean()) {
+ message.setHeader("X-Mailer", context.getProperty(HEADER_XMAILER).evaluateAttributeExpressions(flowFile).getValue());
+ message.setSubject(context.getProperty(SUBJECT).evaluateAttributeExpressions(flowFile).getValue());
+ String messageText = context.getProperty(MESSAGE).evaluateAttributeExpressions(flowFile).getValue();
+
+ if (context.getProperty(INCLUDE_ALL_ATTRIBUTES).asBoolean()) {
messageText = formatAttributes(flowFile, messageText);
}
- String contentType = context.getProperty(CONTENT_TYPE).
- evaluateAttributeExpressions(flowFile).
- getValue();
+ String contentType = context.getProperty(CONTENT_TYPE).evaluateAttributeExpressions(flowFile).getValue();
message.setContent(messageText, contentType);
message.setSentDate(new Date());
- if (context.getProperty(ATTACH_FILE).
- asBoolean()) {
+ if (context.getProperty(ATTACH_FILE).asBoolean()) {
final MimeBodyPart mimeText = new PreencodedMimeBodyPart("base64");
- mimeText.
- setDataHandler(new DataHandler(new ByteArrayDataSource(Base64.
- encodeBase64(messageText.
- getBytes("UTF-8")), "text/plain; charset=\"utf-8\"")));
+ mimeText.setDataHandler(new DataHandler(new ByteArrayDataSource(
+ Base64.encodeBase64(messageText.getBytes("UTF-8")), "text/plain; charset=\"utf-8\"")));
final MimeBodyPart mimeFile = new MimeBodyPart();
session.read(flowFile, new InputStreamCallback() {
@Override
public void process(final InputStream stream) throws IOException {
try {
- mimeFile.
- setDataHandler(new DataHandler(new ByteArrayDataSource(stream, "application/octet-stream")));
+ mimeFile.setDataHandler(new DataHandler(new ByteArrayDataSource(stream, "application/octet-stream")));
} catch (final Exception e) {
throw new IOException(e);
}
}
});
- mimeFile.setFileName(flowFile.
- getAttribute(CoreAttributes.FILENAME.key()));
+ mimeFile.setFileName(flowFile.getAttribute(CoreAttributes.FILENAME.key()));
MimeMultipart multipart = new MimeMultipart();
multipart.addBodyPart(mimeText);
multipart.addBodyPart(mimeFile);
@@ -378,24 +344,18 @@ public class PutEmail extends AbstractProcessor {
Transport.send(message);
- session.getProvenanceReporter().
- send(flowFile, "mailto:" + message.getAllRecipients()[0].
- toString());
+ session.getProvenanceReporter().send(flowFile, "mailto:" + message.getAllRecipients()[0].toString());
session.transfer(flowFile, REL_SUCCESS);
- logger.
- info("Sent email as a result of receiving {}", new Object[]{flowFile});
+ logger.info("Sent email as a result of receiving {}", new Object[]{flowFile});
} catch (final ProcessException | MessagingException | IOException e) {
context.yield();
- logger.
- error("Failed to send email for {}: {}; routing to failure", new Object[]{flowFile, e});
+ logger.error("Failed to send email for {}: {}; routing to failure", new Object[]{flowFile, e});
session.transfer(flowFile, REL_FAILURE);
}
}
/**
- * Based on the input properties, determine whether an authenticate or
- * unauthenticated session should be used. If authenticated, creates a
- * Password Authenticator for use in sending the email.
+ * Based on the input properties, determine whether an authenticate or unauthenticated session should be used. If authenticated, creates a Password Authenticator for use in sending the email.
*
* @param properties mail properties
* @return session
@@ -407,22 +367,18 @@ public class PutEmail extends AbstractProcessor {
/*
* Conditionally create a password authenticator if the 'auth' parameter is set.
*/
- final Session mailSession = auth ? Session.
- getInstance(properties, new Authenticator() {
- @Override
- public PasswordAuthentication getPasswordAuthentication() {
- String username = properties.
- getProperty("mail.smtp.user"),
- password = properties.getProperty("mail.smtp.password");
- return new PasswordAuthentication(username, password);
- }
- }) : Session.getInstance(properties); // without auth
+ final Session mailSession = auth ? Session.getInstance(properties, new Authenticator() {
+ @Override
+ public PasswordAuthentication getPasswordAuthentication() {
+ String username = properties.getProperty("mail.smtp.user"), password = properties.getProperty("mail.smtp.password");
+ return new PasswordAuthentication(username, password);
+ }
+ }) : Session.getInstance(properties); // without auth
return mailSession;
}
/**
- * Uses the mapping of javax.mail properties to NiFi PropertyDescriptors to
- * build the required Properties object to be used for sending this email
+ * Uses the mapping of javax.mail properties to NiFi PropertyDescriptors to build the required Properties object to be used for sending this email
*
* @param context context
* @param flowFile flowFile
@@ -438,14 +394,11 @@ public class PutEmail extends AbstractProcessor {
entrySet()) {
// Evaluate the property descriptor against the flow file
- String flowFileValue = context.getProperty(entry.getValue()).
- evaluateAttributeExpressions(flowFile).
- getValue();
+ String flowFileValue = context.getProperty(entry.getValue()).evaluateAttributeExpressions(flowFile).getValue();
String property = entry.getKey();
- logger.
- debug("Evaluated Mail Property: {} with Value: {}", new Object[]{property, flowFileValue});
+ logger.debug("Evaluated Mail Property: {} with Value: {}", new Object[]{property, flowFileValue});
// Nullable values are not allowed, so filter out
if (null != flowFileValue) {
@@ -464,19 +417,12 @@ public class PutEmail extends AbstractProcessor {
StringBuilder message = new StringBuilder(messagePrepend);
message.append(BODY_SEPARATOR);
message.append("\nStandard FlowFile Metadata:");
- message.append(String.
- format("\n\t%1$s = '%2$s'", "id", flowFile.getId()));
- message.append(String.
- format("\n\t%1$s = '%2$s'", "entryDate", new Date(flowFile.
- getEntryDate())));
- message.append(String.format("\n\t%1$s = '%2$s'", "fileSize", flowFile.
- getSize()));
+ message.append(String.format("\n\t%1$s = '%2$s'", "id", flowFile.getId()));
+ message.append(String.format("\n\t%1$s = '%2$s'", "entryDate", new Date(flowFile.getEntryDate())));
+ message.append(String.format("\n\t%1$s = '%2$s'", "fileSize", flowFile.getSize()));
message.append("\nFlowFile Attributes:");
- for (Entry<String, String> attribute : flowFile.getAttributes().
- entrySet()) {
- message.append(String.
- format("\n\t%1$s = '%2$s'", attribute.getKey(), attribute.
- getValue()));
+ for (Entry<String, String> attribute : flowFile.getAttributes().entrySet()) {
+ message.append(String.format("\n\t%1$s = '%2$s'", attribute.getKey(), attribute.getValue()));
}
message.append("\n");
return message.toString();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java
index 6786bf0..051cb07 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java
@@ -104,8 +104,7 @@ public class PutFTP extends PutFileTransfer<FTPTransfer> {
@Override
protected void beforePut(final FlowFile flowFile, final ProcessContext context, final FTPTransfer transfer) throws IOException {
- transfer.
- sendCommands(getCommands(preSendDescriptorRef.get(), context, flowFile), flowFile);
+ transfer.sendCommands(getCommands(preSendDescriptorRef.get(), context, flowFile), flowFile);
}
@Override
@@ -122,10 +121,10 @@ public class PutFTP extends PutFileTransfer<FTPTransfer> {
@Override
protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String propertyDescriptorName) {
return new PropertyDescriptor.Builder()
- .name(propertyDescriptorName).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- dynamic(true).
- build();
+ .name(propertyDescriptorName)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .dynamic(true)
+ .build();
}
@OnScheduled
@@ -133,8 +132,7 @@ public class PutFTP extends PutFileTransfer<FTPTransfer> {
final Map<Integer, PropertyDescriptor> preDescriptors = new TreeMap<>();
final Map<Integer, PropertyDescriptor> postDescriptors = new TreeMap<>();
- for (final PropertyDescriptor descriptor : context.getProperties().
- keySet()) {
+ for (final PropertyDescriptor descriptor : context.getProperties().keySet()) {
final String name = descriptor.getName();
final Matcher preMatcher = PRE_SEND_CMD_PATTERN.matcher(name);
if (preMatcher.matches()) {
@@ -149,10 +147,8 @@ public class PutFTP extends PutFileTransfer<FTPTransfer> {
}
}
- final List<PropertyDescriptor> preDescriptorList = new ArrayList<>(preDescriptors.
- values());
- final List<PropertyDescriptor> postDescriptorList = new ArrayList<>(postDescriptors.
- values());
+ final List<PropertyDescriptor> preDescriptorList = new ArrayList<>(preDescriptors.values());
+ final List<PropertyDescriptor> postDescriptorList = new ArrayList<>(postDescriptors.values());
this.preSendDescriptorRef.set(preDescriptorList);
this.postSendDescriptorRef.set(postDescriptorList);
}
@@ -160,9 +156,7 @@ public class PutFTP extends PutFileTransfer<FTPTransfer> {
private List<String> getCommands(final List<PropertyDescriptor> descriptors, final ProcessContext context, final FlowFile flowFile) {
final List<String> cmds = new ArrayList<>();
for (final PropertyDescriptor descriptor : descriptors) {
- cmds.add(context.getProperty(descriptor).
- evaluateAttributeExpressions(flowFile).
- getValue());
+ cmds.add(context.getProperty(descriptor).evaluateAttributeExpressions(flowFile).getValue());
}
return cmds;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java
index ce03491..3bbe093 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java
@@ -64,76 +64,76 @@ public class PutFile extends AbstractProcessor {
public static final String FILE_MODIFY_DATE_ATTRIBUTE = "file.lastModifiedTime";
public static final String FILE_MODIFY_DATE_ATTR_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ";
- public static final PropertyDescriptor DIRECTORY = new PropertyDescriptor.Builder().
- name("Directory").
- description("The directory to which files should be written. You may use expression language such as /aa/bb/${path}").
- required(true).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor MAX_DESTINATION_FILES = new PropertyDescriptor.Builder().
- name("Maximum File Count").
- description("Specifies the maximum number of files that can exist in the output directory").
- required(false).
- addValidator(StandardValidators.INTEGER_VALIDATOR).
- build();
- public static final PropertyDescriptor CONFLICT_RESOLUTION = new PropertyDescriptor.Builder().
- name("Conflict Resolution Strategy").
- description("Indicates what should happen when a file with the same name already exists in the output directory").
- required(true).
- defaultValue(FAIL_RESOLUTION).
- allowableValues(REPLACE_RESOLUTION, IGNORE_RESOLUTION, FAIL_RESOLUTION).
- build();
- public static final PropertyDescriptor CHANGE_LAST_MODIFIED_TIME = new PropertyDescriptor.Builder().
- name("Last Modified Time").
- description("Sets the lastModifiedTime on the output file to the value of this attribute. Format must be yyyy-MM-dd'T'HH:mm:ssZ. "
- + "You may also use expression language such as ${file.lastModifiedTime}.").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor CHANGE_PERMISSIONS = new PropertyDescriptor.Builder().
- name("Permissions").
- description("Sets the permissions on the output file to the value of this attribute. Format must be either UNIX rwxrwxrwx with a - in "
+ public static final PropertyDescriptor DIRECTORY = new PropertyDescriptor.Builder()
+ .name("Directory")
+ .description("The directory to which files should be written. You may use expression language such as /aa/bb/${path}")
+ .required(true)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor MAX_DESTINATION_FILES = new PropertyDescriptor.Builder()
+ .name("Maximum File Count")
+ .description("Specifies the maximum number of files that can exist in the output directory")
+ .required(false)
+ .addValidator(StandardValidators.INTEGER_VALIDATOR)
+ .build();
+ public static final PropertyDescriptor CONFLICT_RESOLUTION = new PropertyDescriptor.Builder()
+ .name("Conflict Resolution Strategy")
+ .description("Indicates what should happen when a file with the same name already exists in the output directory")
+ .required(true)
+ .defaultValue(FAIL_RESOLUTION)
+ .allowableValues(REPLACE_RESOLUTION, IGNORE_RESOLUTION, FAIL_RESOLUTION)
+ .build();
+ public static final PropertyDescriptor CHANGE_LAST_MODIFIED_TIME = new PropertyDescriptor.Builder()
+ .name("Last Modified Time")
+ .description("Sets the lastModifiedTime on the output file to the value of this attribute. Format must be yyyy-MM-dd'T'HH:mm:ssZ. "
+ + "You may also use expression language such as ${file.lastModifiedTime}.")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor CHANGE_PERMISSIONS = new PropertyDescriptor.Builder()
+ .name("Permissions")
+ .description("Sets the permissions on the output file to the value of this attribute. Format must be either UNIX rwxrwxrwx with a - in "
+ "place of denied permissions (e.g. rw-r--r--) or an octal number (e.g. 644). You may also use expression language such as "
- + "${file.permissions}.").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor CHANGE_OWNER = new PropertyDescriptor.Builder().
- name("Owner").
- description("Sets the owner on the output file to the value of this attribute. You may also use expression language such as "
- + "${file.owner}.").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor CHANGE_GROUP = new PropertyDescriptor.Builder().
- name("Group").
- description("Sets the group on the output file to the value of this attribute. You may also use expression language such "
- + "as ${file.group}.").
- required(false).
- addValidator(StandardValidators.NON_EMPTY_VALIDATOR).
- expressionLanguageSupported(true).
- build();
- public static final PropertyDescriptor CREATE_DIRS = new PropertyDescriptor.Builder().
- name("Create Missing Directories").
- description("If true, then missing destination directories will be created. If false, flowfiles are penalized and sent to failure.").
- required(true).
- allowableValues("true", "false").
- defaultValue("true").
- build();
+ + "${file.permissions}.")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor CHANGE_OWNER = new PropertyDescriptor.Builder()
+ .name("Owner")
+ .description("Sets the owner on the output file to the value of this attribute. You may also use expression language such as "
+ + "${file.owner}.")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor CHANGE_GROUP = new PropertyDescriptor.Builder()
+ .name("Group")
+ .description("Sets the group on the output file to the value of this attribute. You may also use expression language such "
+ + "as ${file.group}.")
+ .required(false)
+ .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+ .expressionLanguageSupported(true)
+ .build();
+ public static final PropertyDescriptor CREATE_DIRS = new PropertyDescriptor.Builder()
+ .name("Create Missing Directories")
+ .description("If true, then missing destination directories will be created. If false, flowfiles are penalized and sent to failure.")
+ .required(true)
+ .allowableValues("true", "false")
+ .defaultValue("true")
+ .build();
public static final int MAX_FILE_LOCK_ATTEMPTS = 10;
- public static final Relationship REL_SUCCESS = new Relationship.Builder().
- name("success").
- description("Files that have been successfully written to the output directory are transferred to this relationship").
- build();
- public static final Relationship REL_FAILURE = new Relationship.Builder().
- name("failure").
- description("Files that could not be written to the output directory for some reason are transferred to this relationship").
- build();
+ public static final Relationship REL_SUCCESS = new Relationship.Builder()
+ .name("success")
+ .description("Files that have been successfully written to the output directory are transferred to this relationship")
+ .build();
+ public static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("Files that could not be written to the output directory for some reason are transferred to this relationship")
+ .build();
private List<PropertyDescriptor> properties;
private Set<Relationship> relationships;
@@ -177,35 +177,25 @@ public class PutFile extends AbstractProcessor {
}
final StopWatch stopWatch = new StopWatch(true);
- final Path configuredRootDirPath = Paths.get(context.
- getProperty(DIRECTORY).
- evaluateAttributeExpressions(flowFile).
- getValue());
- final String conflictResponse = context.getProperty(CONFLICT_RESOLUTION).
- getValue();
- final Integer maxDestinationFiles = context.
- getProperty(MAX_DESTINATION_FILES).
- asInteger();
+ final Path configuredRootDirPath = Paths.get(context.getProperty(DIRECTORY).evaluateAttributeExpressions(flowFile).getValue());
+ final String conflictResponse = context.getProperty(CONFLICT_RESOLUTION).getValue();
+ final Integer maxDestinationFiles = context.getProperty(MAX_DESTINATION_FILES).asInteger();
final ProcessorLog logger = getLogger();
Path tempDotCopyFile = null;
try {
final Path rootDirPath = configuredRootDirPath;
- final Path tempCopyFile = rootDirPath.resolve("." + flowFile.
- getAttribute(CoreAttributes.FILENAME.key()));
- final Path copyFile = rootDirPath.resolve(flowFile.
- getAttribute(CoreAttributes.FILENAME.key()));
+ final Path tempCopyFile = rootDirPath.resolve("." + flowFile.getAttribute(CoreAttributes.FILENAME.key()));
+ final Path copyFile = rootDirPath.resolve(flowFile.getAttribute(CoreAttributes.FILENAME.key()));
if (!Files.exists(rootDirPath)) {
- if (context.getProperty(CREATE_DIRS).
- asBoolean()) {
+ if (context.getProperty(CREATE_DIRS).asBoolean()) {
Files.createDirectories(rootDirPath);
} else {
flowFile = session.penalize(flowFile);
session.transfer(flowFile, REL_FAILURE);
- logger.
- error("Penalizing {} and routing to 'failure' because the output directory {} does not exist and Processor is "
- + "configured not to create missing directories", new Object[]{flowFile, rootDirPath});
+ logger.error("Penalizing {} and routing to 'failure' because the output directory {} does not exist and Processor is "
+ + "configured not to create missing directories", new Object[]{flowFile, rootDirPath});
return;
}
}
@@ -216,14 +206,12 @@ public class PutFile extends AbstractProcessor {
final Path finalCopyFileDir = finalCopyFile.getParent();
if (Files.exists(finalCopyFileDir) && maxDestinationFiles != null) { // check if too many files already
- final int numFiles = finalCopyFileDir.toFile().
- list().length;
+ final int numFiles = finalCopyFileDir.toFile().list().length;
if (numFiles >= maxDestinationFiles) {
flowFile = session.penalize(flowFile);
- logger.
- info("Penalizing {} and routing to 'failure' because the output directory {} has {} files, which exceeds the "
- + "configured maximum number of files", new Object[]{flowFile, finalCopyFileDir, numFiles});
+ logger.info("Penalizing {} and routing to 'failure' because the output directory {} has {} files, which exceeds the "
+ + "configured maximum number of files", new Object[]{flowFile, finalCopyFileDir, numFiles});
session.transfer(flowFile, REL_FAILURE);
return;
}
@@ -233,18 +221,15 @@ public class PutFile extends AbstractProcessor {
switch (conflictResponse) {
case REPLACE_RESOLUTION:
Files.delete(finalCopyFile);
- logger.
- info("Deleted {} as configured in order to replace with the contents of {}", new Object[]{finalCopyFile, flowFile});
+ logger.info("Deleted {} as configured in order to replace with the contents of {}", new Object[]{finalCopyFile, flowFile});
break;
case IGNORE_RESOLUTION:
session.transfer(flowFile, REL_SUCCESS);
- logger.
- info("Transferring {} to success because file with same name already exists", new Object[]{flowFile});
+ logger.info("Transferring {} to success because file with same name already exists", new Object[]{flowFile});
return;
case FAIL_RESOLUTION:
flowFile = session.penalize(flowFile);
- logger.
- info("Penalizing {} and routing to failure as configured because file with the same name already exists", new Object[]{flowFile});
+ logger.info("Penalizing {} and routing to failure as configured because file with the same name already exists", new Object[]{flowFile});
session.transfer(flowFile, REL_FAILURE);
return;
default:
@@ -254,82 +239,53 @@ public class PutFile extends AbstractProcessor {
session.exportTo(flowFile, dotCopyFile, false);
- final String lastModifiedTime = context.
- getProperty(CHANGE_LAST_MODIFIED_TIME).
- evaluateAttributeExpressions(flowFile).
- getValue();
- if (lastModifiedTime != null && !lastModifiedTime.trim().
- isEmpty()) {
+ final String lastModifiedTime = context.getProperty(CHANGE_LAST_MODIFIED_TIME).evaluateAttributeExpressions(flowFile).getValue();
+ if (lastModifiedTime != null && !lastModifiedTime.trim().isEmpty()) {
try {
final DateFormat formatter = new SimpleDateFormat(FILE_MODIFY_DATE_ATTR_FORMAT, Locale.US);
- final Date fileModifyTime = formatter.
- parse(lastModifiedTime);
- dotCopyFile.toFile().
- setLastModified(fileModifyTime.getTime());
+ final Date fileModifyTime = formatter.parse(lastModifiedTime);
+ dotCopyFile.toFile().setLastModified(fileModifyTime.getTime());
} catch (Exception e) {
- logger.
- warn("Could not set file lastModifiedTime to {} because {}", new Object[]{lastModifiedTime, e});
+ logger.warn("Could not set file lastModifiedTime to {} because {}", new Object[]{lastModifiedTime, e});
}
}
- final String permissions = context.getProperty(CHANGE_PERMISSIONS).
- evaluateAttributeExpressions(flowFile).
- getValue();
- if (permissions != null && !permissions.trim().
- isEmpty()) {
+ final String permissions = context.getProperty(CHANGE_PERMISSIONS).evaluateAttributeExpressions(flowFile).getValue();
+ if (permissions != null && !permissions.trim().isEmpty()) {
try {
String perms = stringPermissions(permissions);
if (!perms.isEmpty()) {
- Files.
- setPosixFilePermissions(dotCopyFile, PosixFilePermissions.
- fromString(perms));
+ Files.setPosixFilePermissions(dotCopyFile, PosixFilePermissions.fromString(perms));
}
} catch (Exception e) {
- logger.
- warn("Could not set file permissions to {} because {}", new Object[]{permissions, e});
+ logger.warn("Could not set file permissions to {} because {}", new Object[]{permissions, e});
}
}
- final String owner = context.getProperty(CHANGE_OWNER).
- evaluateAttributeExpressions(flowFile).
- getValue();
- if (owner != null && !owner.trim().
- isEmpty()) {
+ final String owner = context.getProperty(CHANGE_OWNER).evaluateAttributeExpressions(flowFile).getValue();
+ if (owner != null && !owner.trim().isEmpty()) {
try {
- UserPrincipalLookupService lookupService = dotCopyFile.
- getFileSystem().
- getUserPrincipalLookupService();
- Files.setOwner(dotCopyFile, lookupService.
- lookupPrincipalByName(owner));
+ UserPrincipalLookupService lookupService = dotCopyFile.getFileSystem().getUserPrincipalLookupService();
+ Files.setOwner(dotCopyFile, lookupService.lookupPrincipalByName(owner));
} catch (Exception e) {
- logger.
- warn("Could not set file owner to {} because {}", new Object[]{owner, e});
+ logger.warn("Could not set file owner to {} because {}", new Object[]{owner, e});
}
}
- final String group = context.getProperty(CHANGE_GROUP).
- evaluateAttributeExpressions(flowFile).
- getValue();
- if (group != null && !group.trim().
- isEmpty()) {
+ final String group = context.getProperty(CHANGE_GROUP).evaluateAttributeExpressions(flowFile).getValue();
+ if (group != null && !group.trim().isEmpty()) {
try {
- UserPrincipalLookupService lookupService = dotCopyFile.
- getFileSystem().
- getUserPrincipalLookupService();
- PosixFileAttributeView view = Files.
- getFileAttributeView(dotCopyFile, PosixFileAttributeView.class);
- view.setGroup(lookupService.
- lookupPrincipalByGroupName(group));
+ UserPrincipalLookupService lookupService = dotCopyFile.getFileSystem().getUserPrincipalLookupService();
+ PosixFileAttributeView view = Files.getFileAttributeView(dotCopyFile, PosixFileAttributeView.class);
+ view.setGroup(lookupService.lookupPrincipalByGroupName(group));
} catch (Exception e) {
- logger.
- warn("Could not set file group to {} because {}", new Object[]{group, e});
+ logger.warn("Could not set file group to {} because {}", new Object[]{group, e});
}
}
boolean renamed = false;
for (int i = 0; i < 10; i++) { // try rename up to 10 times.
- if (dotCopyFile.toFile().
- renameTo(finalCopyFile.toFile())) {
+ if (dotCopyFile.toFile().renameTo(finalCopyFile.toFile())) {
renamed = true;
break;// rename was successful
}
@@ -337,36 +293,27 @@ public class PutFile extends AbstractProcessor {
}
if (!renamed) {
- if (Files.exists(dotCopyFile) && dotCopyFile.toFile().
- delete()) {
- logger.
- debug("Deleted dot copy file {}", new Object[]{dotCopyFile});
+ if (Files.exists(dotCopyFile) && dotCopyFile.toFile().delete()) {
+ logger.debug("Deleted dot copy file {}", new Object[]{dotCopyFile});
}
throw new ProcessException("Could not rename: " + dotCopyFile);
} else {
- logger.
- info("Produced copy of {} at location {}", new Object[]{flowFile, finalCopyFile});
+ logger.info("Produced copy of {} at location {}", new Object[]{flowFile, finalCopyFile});
}
- session.getProvenanceReporter().
- send(flowFile, finalCopyFile.toFile().
- toURI().
- toString(), stopWatch.
- getElapsed(TimeUnit.MILLISECONDS));
+ session.getProvenanceReporter().send(flowFile, finalCopyFile.toFile().toURI().toString(), stopWatch.getElapsed(TimeUnit.MILLISECONDS));
session.transfer(flowFile, REL_SUCCESS);
} catch (final Throwable t) {
if (tempDotCopyFile != null) {
try {
Files.deleteIfExists(tempDotCopyFile);
} catch (final Exception e) {
- logger.
- error("Unable to remove temporary file {} due to {}", new Object[]{tempDotCopyFile, e});
+ logger.error("Unable to remove temporary file {} due to {}", new Object[]{tempDotCopyFile, e});
}
}
flowFile = session.penalize(flowFile);
- logger.
- error("Penalizing {} and transferring to failure due to {}", new Object[]{flowFile, t});
+ logger.error("Penalizing {} and transferring to failure due to {}", new Object[]{flowFile, t});
session.transfer(flowFile, REL_FAILURE);
}
}
@@ -375,11 +322,9 @@ public class PutFile extends AbstractProcessor {
String permissions = "";
final Pattern rwxPattern = Pattern.compile("^[rwx-]{9}$");
final Pattern numPattern = Pattern.compile("\\d+");
- if (rwxPattern.matcher(perms).
- matches()) {
+ if (rwxPattern.matcher(perms).matches()) {
permissions = perms;
- } else if (numPattern.matcher(perms).
- matches()) {
+ } else if (numPattern.matcher(perms).matches()) {
try {
int number = Integer.parseInt(perms, 8);
StringBuilder permBuilder = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java
index 893aee9..b60d07f 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFileTransfer.java
@@ -48,18 +48,18 @@ import java.util.concurrent.TimeUnit;
*/
public abstract class PutFileTransfer<T extends FileTransfer> extends AbstractProcessor {
- public static final Relationship REL_SUCCESS = new Relationship.Builder().
- name("success").
- description("FlowFiles that are successfully sent will be routed to success").
- build();
- public static final Relationship REL_FAILURE = new Relationship.Builder().
- name("failure").
- description("FlowFiles that failed to send to the remote system; failure is usually looped back to this processor").
- build();
- public static final Relationship REL_REJECT = new Relationship.Builder().
- name("reject").
- description("FlowFiles that were rejected by the destination system").
- build();
+ public static final Relationship REL_SUCCESS = new Relationship.Builder()
+ .name("success")
+ .description("FlowFiles that are successfully sent will be routed to success")
+ .build();
+ public static final Relationship REL_FAILURE = new Relationship.Builder()
+ .name("failure")
+ .description("FlowFiles that failed to send to the remote system; failure is usually looped back to this processor")
+ .build();
+ public static final Relationship REL_REJECT = new Relationship.Builder()
+ .name("reject")
+ .description("FlowFiles that were rejected by the destination system")
+ .build();
private final Set<Relationship> relationships;
@@ -95,43 +95,27 @@ public abstract class PutFileTransfer<T extends FileTransfer> extends AbstractPr
}
final ProcessorLog logger = getLogger();
- final String hostname = context.getProperty(FileTransfer.HOSTNAME).
- evaluateAttributeExpressions(flowFile).
- getValue();
+ final String hostname = context.getProperty(FileTransfer.HOSTNAME).evaluateAttributeExpressions(flowFile).getValue();
- final int maxNumberOfFiles = context.
- getProperty(FileTransfer.BATCH_SIZE).
- asInteger();
+ final int maxNumberOfFiles = context.getProperty(FileTransfer.BATCH_SIZE).asInteger();
int fileCount = 0;
try (final T transfer = getFileTransfer(context)) {
do {
- final String rootPath = context.
- getProperty(FileTransfer.REMOTE_PATH).
- evaluateAttributeExpressions(flowFile).
- getValue();
+ final String rootPath = context.getProperty(FileTransfer.REMOTE_PATH).evaluateAttributeExpressions(flowFile).getValue();
final String workingDirPath;
if (rootPath == null) {
workingDirPath = null;
} else {
File workingDirectory = new File(rootPath);
- if (!workingDirectory.getPath().
- startsWith("/") && !workingDirectory.getPath().
- startsWith("\\")) {
- workingDirectory = new File(transfer.
- getHomeDirectory(flowFile), workingDirectory.
- getPath());
+ if (!workingDirectory.getPath().startsWith("/") && !workingDirectory.getPath().startsWith("\\")) {
+ workingDirectory = new File(transfer.getHomeDirectory(flowFile), workingDirectory.getPath());
}
- workingDirPath = workingDirectory.getPath().
- replace("\\", "/");
+ workingDirPath = workingDirectory.getPath().replace("\\", "/");
}
- final boolean rejectZeroByteFiles = context.
- getProperty(FileTransfer.REJECT_ZERO_BYTE).
- asBoolean();
- final ConflictResult conflictResult = identifyAndResolveConflictFile(context.
- getProperty(FileTransfer.CONFLICT_RESOLUTION).
- getValue(),
- transfer, workingDirPath, flowFile, rejectZeroByteFiles, logger);
+ final boolean rejectZeroByteFiles = context.getProperty(FileTransfer.REJECT_ZERO_BYTE).asBoolean();
+ final ConflictResult conflictResult
+ = identifyAndResolveConflictFile(context.getProperty(FileTransfer.CONFLICT_RESOLUTION).getValue(), transfer, workingDirPath, flowFile, rejectZeroByteFiles, logger);
if (conflictResult.isTransfer()) {
final StopWatch stopWatch = new StopWatch();
@@ -144,37 +128,28 @@ public abstract class PutFileTransfer<T extends FileTransfer> extends AbstractPr
@Override
public void process(final InputStream in) throws IOException {
try (final InputStream bufferedIn = new BufferedInputStream(in)) {
- if (workingDirPath != null && context.
- getProperty(SFTPTransfer.CREATE_DIRECTORY).
- asBoolean()) {
- transfer.
- ensureDirectoryExists(flowFileToTransfer, new File(workingDirPath));
+ if (workingDirPath != null && context.getProperty(SFTPTransfer.CREATE_DIRECTORY).asBoolean()) {
+ transfer.ensureDirectoryExists(flowFileToTransfer, new File(workingDirPath));
}
- fullPathRef.set(transfer.
- put(flowFileToTransfer, workingDirPath, conflictResult.
- getFileName(), bufferedIn));
+ fullPathRef.set(transfer.put(flowFileToTransfer, workingDirPath, conflictResult.getFileName(), bufferedIn));
}
}
});
afterPut(flowFile, context, transfer);
stopWatch.stop();
- final String dataRate = stopWatch.
- calculateDataRate(flowFile.getSize());
- final long millis = stopWatch.
- getDuration(TimeUnit.MILLISECONDS);
- logger.
- info("Successfully transfered {} to {} on remote host {} in {} milliseconds at a rate of {}",
- new Object[]{flowFile, fullPathRef.get(), hostname, millis, dataRate});
+ final String dataRate = stopWatch.calculateDataRate(flowFile.getSize());
+ final long millis = stopWatch.getDuration(TimeUnit.MILLISECONDS);
+ logger.info("Successfully transfered {} to {} on remote host {} in {} milliseconds at a rate of {}",
+ new Object[]{flowFile, fullPathRef.get(), hostname, millis, dataRate});
String fullPathWithSlash = fullPathRef.get();
if (!fullPathWithSlash.startsWith("/")) {
fullPathWithSlash = "/" + fullPathWithSlash;
}
final String destinationUri = transfer.getProtocolName() + "://" + hostname + fullPathWithSlash;
- session.getProvenanceReporter().
- send(flowFile, destinationUri, millis);
+ session.getProvenanceReporter().send(flowFile, destinationUri, millis);
}
if (conflictResult.isPenalize()) {
@@ -183,28 +158,23 @@ public abstract class PutFileTransfer<T extends FileTransfer> extends AbstractPr
session.transfer(flowFile, conflictResult.getRelationship());
session.commit();
- } while (isScheduled() && (getRelationships().
- size() == context.getAvailableRelationships().
- size()) && (++fileCount < maxNumberOfFiles) && ((flowFile = session.
- get()) != null));
+ } while (isScheduled()
+ && (getRelationships().size() == context.getAvailableRelationships().size())
+ && (++fileCount < maxNumberOfFiles)
+ && ((flowFile = session.get()) != null));
} catch (final IOException e) {
context.yield();
- logger.
- error("Unable to transfer {} to remote host {} due to {}", new Object[]{flowFile, hostname, e});
+ logger.error("Unable to transfer {} to remote host {} due to {}", new Object[]{flowFile, hostname, e});
flowFile = session.penalize(flowFile);
session.transfer(flowFile, REL_FAILURE);
} catch (final FlowFileAccessException e) {
context.yield();
- logger.
- error("Unable to transfer {} to remote host {} due to {}", new Object[]{flowFile, hostname, e.
- getCause()});
+ logger.error("Unable to transfer {} to remote host {} due to {}", new Object[]{flowFile, hostname, e.getCause()});
flowFile = session.penalize(flowFile);
session.transfer(flowFile, REL_FAILURE);
} catch (final ProcessException e) {
context.yield();
- logger.
- error("Unable to transfer {} to remote host {} due to {}: {}; routing to failure", new Object[]{flowFile, hostname, e, e.
- getCause()});
+ logger.error("Unable to transfer {} to remote host {} due to {}: {}; routing to failure", new Object[]{flowFile, hostname, e, e.getCause()});
flowFile = session.penalize(flowFile);
session.transfer(flowFile, REL_FAILURE);
}
@@ -222,62 +192,53 @@ public abstract class PutFileTransfer<T extends FileTransfer> extends AbstractPr
if (rejectZeroByteFiles) {
final long sizeInBytes = flowFile.getSize();
if (sizeInBytes == 0) {
- logger.
- warn("Rejecting {} because it is zero bytes", new Object[]{flowFile});
+ logger.warn("Rejecting {} because it is zero bytes", new Object[]{flowFile});
return new ConflictResult(REL_REJECT, false, fileName, true);
}
}
//Second, check if the user doesn't care about detecting naming conflicts ahead of time
- if (conflictResolutionType.
- equalsIgnoreCase(FileTransfer.CONFLICT_RESOLUTION_NONE)) {
+ if (conflictResolutionType.equalsIgnoreCase(FileTransfer.CONFLICT_RESOLUTION_NONE)) {
return new ConflictResult(destinationRelationship, transferFile, fileName, penalizeFile);
}
- final FileInfo remoteFileInfo = transfer.
- getRemoteFileInfo(flowFile, path, fileName);
+ final FileInfo remoteFileInfo = transfer.getRemoteFileInfo(flowFile, path, fileName);
if (remoteFileInfo == null) {
return new ConflictResult(destinationRelationship, transferFile, fileName, penalizeFile);
}
if (remoteFileInfo.isDirectory()) {
- logger.
- info("Resolving conflict by rejecting {} due to conflicting filename with a directory or file already on remote server", new Object[]{flowFile});
+ logger.info("Resolving conflict by rejecting {} due to conflicting filename with a directory or file already on remote server", new Object[]{flowFile});
return new ConflictResult(REL_REJECT, false, fileName, false);
}
- logger.
- info("Discovered a filename conflict on the remote server for {} so handling using configured Conflict Resolution of {}",
- new Object[]{flowFile, conflictResolutionType});
+ logger.info("Discovered a filename conflict on the remote server for {} so handling using configured Conflict Resolution of {}",
+ new Object[]{flowFile, conflictResolutionType});
switch (conflictResolutionType.toUpperCase()) {
case FileTransfer.CONFLICT_RESOLUTION_REJECT:
destinationRelationship = REL_REJECT;
transferFile = false;
penalizeFile = false;
- logger.
- info("Resolving conflict by rejecting {} due to conflicting filename with a directory or file already on remote server", new Object[]{flowFile});
+ logger.info("Resolving conflict by rejecting {} due to conflicting filename with a directory or file already on remote server", new Object[]{flowFile});
break;
case FileTransfer.CONFLICT_RESOLUTION_REPLACE:
transfer.deleteFile(path, fileName);
destinationRelationship = REL_SUCCESS;
transferFile = true;
penalizeFile = false;
- logger.
- info("Resolving filename conflict for {} with remote server by deleting remote file and replacing with flow file", new Object[]{flowFile});
+ logger.info("Resolving filename conflict for {} with remote server by deleting remote file and replacing with flow file", new Object[]{flowFile});
break;
case FileTransfer.CONFLICT_RESOLUTION_RENAME:
boolean uniqueNameGenerated = false;
for (int i = 1; i < 100 && !uniqueNameGenerated; i++) {
String possibleFileName = i + "." + fileName;
- final FileInfo renamedFileInfo = transfer.
- getRemoteFileInfo(flowFile, path, possibleFileName);
+ final FileInfo renamedFileInfo = transfer.getRemoteFileInfo(flowFile, path, possibleFileName);
uniqueNameGenerated = (renamedFileInfo == null);
if (uniqueNameGenerated) {
fileName = possibleFileName;
- logger.
- info("Attempting to resolve filename conflict for {} on the remote server by using a newly generated filename of: {}", new Object[]{flowFile, fileName});
+ logger.info("Attempting to resolve filename conflict for {} on the remote server by using a newly generated filename of: {}", new Object[]{flowFile, fileName});
destinationRelationship = REL_SUCCESS;
transferFile = true;
penalizeFile = false;
@@ -288,23 +249,20 @@ public abstract class PutFileTransfer<T extends FileTransfer> extends AbstractPr
destinationRelationship = REL_REJECT;
transferFile = false;
penalizeFile = false;
- logger.
- info("Could not determine a unique name after 99 attempts for. Switching resolution mode to REJECT for " + flowFile);
+ logger.info("Could not determine a unique name after 99 attempts for. Switching resolution mode to REJECT for " + flowFile);
}
break;
case FileTransfer.CONFLICT_RESOLUTION_IGNORE:
destinationRelationship = REL_SUCCESS;
transferFile = false;
penalizeFile = false;
- logger.
- info("Resolving conflict for {} by not transferring file and and still considering the process a success.", new Object[]{flowFile});
+ logger.info("Resolving conflict for {} by not transferring file and and still considering the process a success.", new Object[]{flowFile});
break;
case FileTransfer.CONFLICT_RESOLUTION_FAIL:
destinationRelationship = REL_FAILURE;
transferFile = false;
penalizeFile = true;
- logger.
- info("Resolved filename conflict for {} as configured by routing to FAILURE relationship.", new Object[]{flowFile});
+ logger.info("Resolved filename conflict for {} as configured by routing to FAILURE relationship.", new Object[]{flowFile});
default:
break;
}