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 2016/03/09 15:48:50 UTC

[1/2] nifi git commit: NIFI-1573 Allow programmatic access to a Processor's name

Repository: nifi
Updated Branches:
  refs/heads/master 0f9b55afb -> a2164136d


NIFI-1573 Allow programmatic access to a Processor's name


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

Branch: refs/heads/master
Commit: 738236a41dc9f0f5f2c50dc425aa12948275aad6
Parents: 58e50ae
Author: Richard Miskin <r....@gmail.com>
Authored: Sat Feb 27 15:18:22 2016 +0000
Committer: Richard Miskin <r....@gmail.com>
Committed: Sat Feb 27 15:18:22 2016 +0000

----------------------------------------------------------------------
 .../src/main/java/org/apache/nifi/processor/ProcessContext.java | 5 +++++
 .../src/main/java/org/apache/nifi/util/MockProcessContext.java  | 5 +++++
 .../org/apache/nifi/documentation/mock/MockProcessContext.java  | 5 +++++
 .../nifi/controller/scheduling/ConnectableProcessContext.java   | 5 +++++
 .../java/org/apache/nifi/processor/StandardProcessContext.java  | 5 +++++
 .../org/apache/nifi/processor/StandardSchedulingContext.java    | 5 +++++
 6 files changed, 30 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/738236a4/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java
----------------------------------------------------------------------
diff --git a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java
index 91ea1a2..c112e8a 100644
--- a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java
+++ b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessContext.java
@@ -160,4 +160,9 @@ public interface ProcessContext {
      * @return the StateManager that can be used to store and retrieve state for this component
      */
     StateManager getStateManager();
+
+    /**
+     * @return the configured name of this processor
+     */
+    String getName();
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/738236a4/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
----------------------------------------------------------------------
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
index 02a1d8a..01b415f 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessContext.java
@@ -355,4 +355,9 @@ public class MockProcessContext extends MockControllerServiceLookup implements S
     public StateManager getStateManager() {
         return stateManager;
     }
+
+    @Override
+    public String getName() {
+        return "";
+    }
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/738236a4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessContext.java
index 1acdd49..22e9727 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/mock/MockProcessContext.java
@@ -108,4 +108,9 @@ public class MockProcessContext implements ProcessContext {
     public StateManager getStateManager() {
         return null;
     }
+
+    @Override
+    public String getName() {
+        return null;
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/nifi/blob/738236a4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java
index 5e26c09..169cdee 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/ConnectableProcessContext.java
@@ -243,4 +243,9 @@ public class ConnectableProcessContext implements ProcessContext {
     public StateManager getStateManager() {
         return stateManager;
     }
+
+    @Override
+    public String getName() {
+        return connectable.getName();
+    }
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/738236a4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
index 5bb1a86..dae7d0c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardProcessContext.java
@@ -216,4 +216,9 @@ public class StandardProcessContext implements ProcessContext, ControllerService
     public StateManager getStateManager() {
         return stateManager;
     }
+
+    @Override
+    public String getName() {
+        return procNode.getName();
+    }
 }

http://git-wip-us.apache.org/repos/asf/nifi/blob/738236a4/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardSchedulingContext.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardSchedulingContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardSchedulingContext.java
index 4985fe6..3ba71ad 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardSchedulingContext.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/StandardSchedulingContext.java
@@ -147,4 +147,9 @@ public class StandardSchedulingContext implements SchedulingContext {
     public StateManager getStateManager() {
         return stateManager;
     }
+
+    @Override
+    public String getName() {
+        return processorNode.getName();
+    }
 }


[2/2] nifi git commit: Merge branch 'NIFI-1573' of https://github.com/rpmiskin/nifi into NIFI-1573

Posted by ma...@apache.org.
Merge branch 'NIFI-1573' of https://github.com/rpmiskin/nifi into NIFI-1573


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

Branch: refs/heads/master
Commit: a2164136dbd1d0a6a7afe305b4b74064e271c984
Parents: 0f9b55a 738236a
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Mar 9 09:40:37 2016 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Mar 9 09:40:37 2016 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/nifi/processor/ProcessContext.java | 5 +++++
 .../src/main/java/org/apache/nifi/util/MockProcessContext.java  | 5 +++++
 .../org/apache/nifi/documentation/mock/MockProcessContext.java  | 5 +++++
 .../nifi/controller/scheduling/ConnectableProcessContext.java   | 5 +++++
 .../java/org/apache/nifi/processor/StandardProcessContext.java  | 5 +++++
 .../org/apache/nifi/processor/StandardSchedulingContext.java    | 5 +++++
 6 files changed, 30 insertions(+)
----------------------------------------------------------------------