http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/54818893/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml index 7a357d5..78694cc 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/resources/org/apache/tika/mime/custom-mimetypes.xml @@ -15,83 +15,83 @@ --> <mime-info> - <mime-type type="application/flowfile-v1"> - <_comment>NiFi FlowFile V1</_comment> - <sub-class-of type="application/x-tar"/> - <magic> - <match value="flowfile.attributes" type="string" offset="0" /> - </magic> - </mime-type> + <mime-type type="application/flowfile-v1"> + <_comment>NiFi FlowFile V1</_comment> + <sub-class-of type="application/x-tar"/> + <magic> + <match value="flowfile.attributes" type="string" offset="0" /> + </magic> + </mime-type> - <mime-type type="application/flowfile-v3"> - <_comment>NiFi FlowFile V3</_comment> - <magic> - <match value="NiFiFF3" type="string" offset="0" /> - </magic> - </mime-type> + <mime-type type="application/flowfile-v3"> + <_comment>NiFi FlowFile V3</_comment> + <magic> + <match value="NiFiFF3" type="string" offset="0" /> + </magic> + </mime-type> - <mime-type type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"> - <_comment>Office Open XML Workbook</_comment> - <glob pattern="*.xlsx"/> - <sub-class-of type="application/x-tika-ooxml"/> - <magic priority="60"> - <match value="PK\003\004" type="string" offset="0"> - <match value="[Content_Types].xml" type="string" offset="30"> - <match value="xl/_rels/workbook.xml.rels" type="string" offset="30:4096"/> - </match> - </match> - </magic> - </mime-type> + <mime-type type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"> + <_comment>Office Open XML Workbook</_comment> + <glob pattern="*.xlsx"/> + <sub-class-of type="application/x-tika-ooxml"/> + <magic priority="60"> + <match value="PK\003\004" type="string" offset="0"> + <match value="[Content_Types].xml" type="string" offset="30"> + <match value="xl/_rels/workbook.xml.rels" type="string" offset="30:4096"/> + </match> + </match> + </magic> + </mime-type> - <mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.document"> - <_comment>Office Open XML Document</_comment> - <glob pattern="*.docx"/> - <sub-class-of type="application/x-tika-ooxml"/> - <magic priority="60"> - <match value="PK\003\004" type="string" offset="0"> - <match value="[Content_Types].xml" type="string" offset="30"> - <match value="word/_rels/document.xml.rels" type="string" offset="30:4096"/> - </match> - </match> - </magic> - </mime-type> + <mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.document"> + <_comment>Office Open XML Document</_comment> + <glob pattern="*.docx"/> + <sub-class-of type="application/x-tika-ooxml"/> + <magic priority="60"> + <match value="PK\003\004" type="string" offset="0"> + <match value="[Content_Types].xml" type="string" offset="30"> + <match value="word/_rels/document.xml.rels" type="string" offset="30:4096"/> + </match> + </match> + </magic> + </mime-type> - <mime-type type="application/vnd.openxmlformats-officedocument.presentationml.presentation"> - <_comment>Office Open XML Presentation</_comment> - <glob pattern="*.pptx"/> - <glob pattern="*.thmx"/> - <sub-class-of type="application/x-tika-ooxml"/> - <magic priority="60"> - <match value="PK\003\004" type="string" offset="0"> - <match value="[Content_Types].xml" type="string" offset="30"> - <match value="ppt/slides/_rels/slide" type="string" offset="30:4096"/> - </match> - </match> - </magic> - </mime-type> + <mime-type type="application/vnd.openxmlformats-officedocument.presentationml.presentation"> + <_comment>Office Open XML Presentation</_comment> + <glob pattern="*.pptx"/> + <glob pattern="*.thmx"/> + <sub-class-of type="application/x-tika-ooxml"/> + <magic priority="60"> + <match value="PK\003\004" type="string" offset="0"> + <match value="[Content_Types].xml" type="string" offset="30"> + <match value="ppt/slides/_rels/slide" type="string" offset="30:4096"/> + </match> + </match> + </magic> + </mime-type> - <mime-type type="application/java-archive"> - <_comment>Java Archive</_comment> - <tika:link>http://en.wikipedia.org/wiki/.jar</tika:link> - <tika:uti>com.sun.java-archive</tika:uti> - <sub-class-of type="application/zip"/> - <glob pattern="*.jar"/> - <magic priority="50"> - <match value="PK\003\004" type="string" offset="0"> - <match value="META-INF/MANIFEST.MF" type="string" offset="0:1024"/> - </match> - </magic> - </mime-type> + <mime-type type="application/java-archive"> + <_comment>Java Archive</_comment> + <tika:link>http://en.wikipedia.org/wiki/.jar</tika:link> + <tika:uti>com.sun.java-archive</tika:uti> + <sub-class-of type="application/zip"/> + <glob pattern="*.jar"/> + <magic priority="50"> + <match value="PK\003\004" type="string" offset="0"> + <match value="META-INF/MANIFEST.MF" type="string" offset="0:1024"/> + </match> + </magic> + </mime-type> - <!-- Override tika's default behavior for GNU tar detection because nobody calls - a GNU tar a .gtar --> - <mime-type type="application/x-tar"> - <_comment>GNU tar Compressed File Archive (GNU Tape Archive)</_comment> - <magic priority="60"> - <!-- GNU tar archive --> - <match value="ustar \0" type="string" offset="257" /> - </magic> - <glob pattern="*.tar"/> - </mime-type> + <!-- Override tika's default behavior for GNU tar detection because nobody calls + a GNU tar a .gtar --> + <mime-type type="application/x-tar"> + <_comment>GNU tar Compressed File Archive (GNU Tape Archive)</_comment> + <magic priority="60"> + <!-- GNU tar archive --> + <match value="ustar \0" type="string" offset="257" /> + </magic> + <glob pattern="*.tar"/> + </mime-type> </mime-info>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/54818893/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 c9ed9f9..70f2579 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,7 +21,8 @@ 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/54818893/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 cf4f609..772ca0b 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 @@ -28,26 +28,28 @@ import org.apache.activemq.util.ByteArrayOutputStream; import org.apache.nifi.stream.io.StreamUtils; public class CaptureServlet extends HttpServlet { + private static final long serialVersionUID = 8402271018449653919L; private volatile byte[] lastPost; - + public byte[] getLastPost() { return lastPost; } - + @Override protected void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); StreamUtils.copy(request.getInputStream(), baos); this.lastPost = baos.toByteArray(); - + response.setStatus(Status.OK.getStatusCode()); } - + @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/54818893/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HelloWorldServlet.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HelloWorldServlet.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HelloWorldServlet.java index 720bb74..7fe12b3 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HelloWorldServlet.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/HelloWorldServlet.java @@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.nifi.stream.io.StreamUtils; public class HelloWorldServlet extends HttpServlet { + private static final long serialVersionUID = -8821242726929583763L; @Override @@ -37,5 +38,5 @@ public class HelloWorldServlet extends HttpServlet { StreamUtils.copy(fis, out); } } - + } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/54818893/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 ec3211c..580450f 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,9 +47,11 @@ 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; } @@ -57,14 +59,16 @@ 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; } @@ -72,7 +76,8 @@ 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/54818893/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 9b632f8..4005db7 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 @@ -31,53 +31,68 @@ 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); } } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/54818893/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 df1d506..f5fea2c 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,101 +30,133 @@ 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}; + + 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/54818893/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 90f4ed1..dcec7b3 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 @@ -16,7 +16,6 @@ */ package org.apache.nifi.processors.standard; -import org.apache.nifi.processors.standard.ControlRate; import java.util.HashMap; import java.util.Map; @@ -30,7 +29,8 @@ 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"); @@ -51,7 +51,7 @@ public class TestControlRate { runner.assertTransferCount(ControlRate.REL_FAILURE, 0); runner.assertQueueNotEmpty(); - // at this point, we have sent through 27,000 but our max is 20,000 per second. + // at this point, we have sent through 27,000 but our max is 20,000 per second. // After 1 second, we should be able to send another 13,000 Thread.sleep(1200L); runner.run(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/54818893/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 1b057d9..f303019 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,16 +29,21 @@ 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/54818893/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 eed0d36..ef69a00 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,8 +50,10 @@ 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); } @@ -60,18 +62,21 @@ 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"); runner.enqueue(new byte[]{}, props); 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); @@ -87,25 +92,29 @@ 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); - + Map<String, String> props = new HashMap<>(); props.put("hash.value", "1000"); 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); } @@ -203,7 +212,8 @@ 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/54818893/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 ab4c978..dfe52bf 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 @@ -30,12 +30,14 @@ public class TestDistributeLoad { 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.DistributeLoad", "debug"); + System. + setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.DistributeLoad", "debug"); } @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++) { @@ -51,7 +53,8 @@ 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"); @@ -71,7 +74,8 @@ 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"); @@ -117,10 +121,13 @@ 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/54818893/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 fec411d..5f6437a 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,10 +30,12 @@ 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(); @@ -41,7 +43,9 @@ 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); @@ -50,16 +54,20 @@ 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(); @@ -70,10 +78,12 @@ 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(); @@ -84,10 +94,12 @@ 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(); @@ -95,7 +107,9 @@ 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); @@ -104,16 +118,20 @@ 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(); @@ -124,10 +142,12 @@ 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(); @@ -135,7 +155,9 @@ 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); @@ -144,16 +166,20 @@ 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/54818893/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 07e0739..1ec1fc9 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 @@ -32,33 +32,44 @@ 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/54818893/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 5fa8f4d..25dfc1b 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,60 +38,77 @@ 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"); @@ -103,8 +120,10 @@ 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); @@ -113,15 +132,22 @@ 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"; @@ -135,15 +161,23 @@ 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"; @@ -157,15 +191,23 @@ 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"; @@ -179,17 +221,25 @@ 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); @@ -198,16 +248,19 @@ 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); @@ -216,15 +269,19 @@ 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); @@ -233,13 +290,17 @@ 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); @@ -248,17 +309,21 @@ 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); @@ -267,26 +332,34 @@ 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)); } } }); @@ -296,7 +369,9 @@ 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); @@ -310,22 +385,29 @@ 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)); } } }); @@ -335,7 +417,9 @@ 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/54818893/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 c3e463a..b88b9f9 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 @@ -33,60 +33,81 @@ 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]"); @@ -96,15 +117,19 @@ 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")); @@ -113,8 +138,10 @@ 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); @@ -125,33 +152,45 @@ 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"));
