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 2017/11/06 16:50:18 UTC
nifi git commit: NIFI-4454: Added Process Groups' variables to search
capability
Repository: nifi
Updated Branches:
refs/heads/master 296928c51 -> f4a1c9b54
NIFI-4454: Added Process Groups' variables to search capability
Signed-off-by: Matthew Burgess <ma...@apache.org>
This closes #2254
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f4a1c9b5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f4a1c9b5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f4a1c9b5
Branch: refs/heads/master
Commit: f4a1c9b5472fcd6390643cd332051f894814fca8
Parents: 296928c
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Nov 6 10:37:06 2017 -0500
Committer: Matthew Burgess <ma...@apache.org>
Committed: Mon Nov 6 11:27:05 2017 -0500
----------------------------------------------------------------------
.../apache/nifi/web/controller/ControllerFacade.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/f4a1c9b5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
index 66a5073..a4e8000 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
@@ -79,6 +79,8 @@ import org.apache.nifi.provenance.search.QuerySubmission;
import org.apache.nifi.provenance.search.SearchTerm;
import org.apache.nifi.provenance.search.SearchTerms;
import org.apache.nifi.provenance.search.SearchableField;
+import org.apache.nifi.registry.ComponentVariableRegistry;
+import org.apache.nifi.registry.VariableDescriptor;
import org.apache.nifi.registry.VariableRegistry;
import org.apache.nifi.remote.RemoteGroupPort;
import org.apache.nifi.remote.RootGroupPort;
@@ -1754,6 +1756,16 @@ public class ControllerFacade implements Authorizable {
addIfAppropriate(searchStr, group.getName(), "Name", matches);
addIfAppropriate(searchStr, group.getComments(), "Comments", matches);
+ final ComponentVariableRegistry varRegistry = group.getVariableRegistry();
+ if (varRegistry != null) {
+ final Map<VariableDescriptor, String> variableMap = varRegistry.getVariableMap();
+ for (final Map.Entry<VariableDescriptor, String> entry : variableMap.entrySet()) {
+ addIfAppropriate(searchStr, entry.getKey().getName(), "Variable Name", matches);
+ addIfAppropriate(searchStr, entry.getValue(), "Variable Value", matches);
+ }
+ }
+
+
if (matches.isEmpty()) {
return null;
}