From 6a22d0aa548fbbce49975d993f830bd7ee74aa8e Mon Sep 17 00:00:00 2001 From: Mark Payne Date: Mon, 6 Nov 2017 10:37:06 -0500 Subject: [PATCH] NIFI-4454: Added Process Groups' variables to search capability --- .../apache/nifi/web/controller/ControllerFacade.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 66a50731f0e7..a4e8000f6831 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.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 @@ private ComponentSearchResultDTO search(final String searchStr, final ProcessGro addIfAppropriate(searchStr, group.getName(), "Name", matches); addIfAppropriate(searchStr, group.getComments(), "Comments", matches); + final ComponentVariableRegistry varRegistry = group.getVariableRegistry(); + if (varRegistry != null) { + final Map variableMap = varRegistry.getVariableMap(); + for (final Map.Entry entry : variableMap.entrySet()) { + addIfAppropriate(searchStr, entry.getKey().getName(), "Variable Name", matches); + addIfAppropriate(searchStr, entry.getValue(), "Variable Value", matches); + } + } + + if (matches.isEmpty()) { return null; }