NIFI-613 and NIFI-379 checkstyle fix

Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a49a03da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a49a03da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a49a03da

Branch: refs/heads/develop
Commit: a49a03da43c52cd84a154f53aaa0ddbd366e6c1b
Parents: 1fb6aa4
Author: joewitt <joew...@apache.org>
Authored: Thu Jun 4 23:29:32 2015 -0400
Committer: joewitt <joew...@apache.org>
Committed: Thu Jun 4 23:29:32 2015 -0400

----------------------------------------------------------------------
 .../org/apache/nifi/processors/standard/TestMergeContent.java    | 4 ++--
 .../org/apache/nifi/processors/standard/TestScanContent.java     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a49a03da/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 65925f7..daad455 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
@@ -73,7 +73,7 @@ public class TestMergeContent {
         bundle.assertContentEquals("Hello, World!".getBytes("UTF-8"));
         bundle.assertAttributeEquals(CoreAttributes.MIME_TYPE.key(), 
"application/plain-text");
     }
-    
+
     @Test
     public void testSimpleBinaryConcatSingleBin() throws IOException, 
InterruptedException {
         final TestRunner runner = TestRunners.newTestRunner(new 
MergeContent());
@@ -92,7 +92,7 @@ public class TestMergeContent {
         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");
-    }    
+    }
 
     @Test
     public void testSimpleBinaryConcatWithTextDelimiters() throws IOException, 
InterruptedException {

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a49a03da/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 c221965..4b87387 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
@@ -18,7 +18,6 @@ package org.apache.nifi.processors.standard;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.StringWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;

Reply via email to