You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2018/01/29 16:02:38 UTC
nifi git commit: NIFI-4686 MockFlowFile now includes penalized status
when copying. This closes #2438.
Repository: nifi
Updated Branches:
refs/heads/master 8bdc2910e -> d8cfb8e6c
NIFI-4686 MockFlowFile now includes penalized status when copying. This closes #2438.
Signed-off-by: Mark Payne <ma...@hotmail.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d8cfb8e6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d8cfb8e6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d8cfb8e6
Branch: refs/heads/master
Commit: d8cfb8e6c516698d65880bbc86a10048b9fbcab8
Parents: 8bdc291
Author: jlwt90 <ja...@live.hk>
Authored: Sun Jan 28 11:37:50 2018 +0900
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Jan 29 11:02:19 2018 -0500
----------------------------------------------------------------------
.../main/java/org/apache/nifi/util/MockFlowFile.java | 2 ++
.../org/apache/nifi/util/TestMockProcessSession.java | 12 ++++++++++++
.../nifi/processors/couchbase/TestGetCouchbaseKey.java | 1 +
3 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/d8cfb8e6/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
index b23f2eb..c379596 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
@@ -94,6 +94,8 @@ public class MockFlowFile implements FlowFileRecord {
final byte[] dataToCopy = ((MockFlowFile) toCopy).data;
this.data = new byte[dataToCopy.length];
System.arraycopy(dataToCopy, 0, this.data, 0, dataToCopy.length);
+
+ this.penalized = toCopy.isPenalized();
}
void setPenalized() {
http://git-wip-us.apache.org/repos/asf/nifi/blob/d8cfb8e6/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java b/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java
index 7173f72..c0cde56 100644
--- a/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java
+++ b/nifi-mock/src/test/java/org/apache/nifi/util/TestMockProcessSession.java
@@ -89,6 +89,18 @@ public class TestMockProcessSession {
session.transfer(ff1);
}
+ @Test
+ public void testKeepPenalizedStatusAfterPuttingAttribute(){
+ final Processor processor = new PoorlyBehavedProcessor();
+ final MockProcessSession session = new MockProcessSession(new SharedSessionState(processor, new AtomicLong(0L)), processor);
+ FlowFile ff1 = session.createFlowFile("hello, world".getBytes());
+ ff1 = session.penalize(ff1);
+ assertEquals(true, ff1.isPenalized());
+ ff1 = session.putAttribute(ff1, "hello", "world");
+ // adding attribute to flow file should not override the original penalized status
+ assertEquals(true, ff1.isPenalized());
+ }
+
protected static class PoorlyBehavedProcessor extends AbstractProcessor {
private static final Relationship REL_FAILURE = new Relationship.Builder()
http://git-wip-us.apache.org/repos/asf/nifi/blob/d8cfb8e6/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/test/java/org/apache/nifi/processors/couchbase/TestGetCouchbaseKey.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/test/java/org/apache/nifi/processors/couchbase/TestGetCouchbaseKey.java b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/test/java/org/apache/nifi/processors/couchbase/TestGetCouchbaseKey.java
index 3776826..92f999e 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/test/java/org/apache/nifi/processors/couchbase/TestGetCouchbaseKey.java
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/src/test/java/org/apache/nifi/processors/couchbase/TestGetCouchbaseKey.java
@@ -407,6 +407,7 @@ public class TestGetCouchbaseKey {
MockFlowFile orgFile = testRunner.getFlowFilesForRelationship(REL_RETRY).get(0);
orgFile.assertContentEquals(inputFileDataStr);
orgFile.assertAttributeEquals(Exception.key(), exception.getClass().getName());
+ Assert.assertEquals(true, orgFile.isPenalized());
}
@Test