Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-4454: Added Process Groups' variables to search capability 

Signed-off-by: Matthew Burgess <mattyb149@apache.org>

This closes #2254
This commit is contained in:
Mark Payne 2017-11-06 10:37:06 -05:00 committed by Matthew Burgess
parent 296928c513
commit f4a1c9b547
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
View File

@ -79,6 +79,8 @@ import org.apache.nifi.provenance.search.QuerySubmission;
import org.apache.nifi.provenance.search.SearchTerm; import org.apache.nifi.provenance.search.SearchTerm;
import org.apache.nifi.provenance.search.SearchTerms; import org.apache.nifi.provenance.search.SearchTerms;
import org.apache.nifi.provenance.search.SearchableField; 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.registry.VariableRegistry;
import org.apache.nifi.remote.RemoteGroupPort; import org.apache.nifi.remote.RemoteGroupPort;
import org.apache.nifi.remote.RootGroupPort; import org.apache.nifi.remote.RootGroupPort;
@ -1754,6 +1756,16 @@ public class ControllerFacade implements Authorizable {
addIfAppropriate(searchStr, group.getName(), "Name", matches); addIfAppropriate(searchStr, group.getName(), "Name", matches);
addIfAppropriate(searchStr, group.getComments(), "Comments", 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()) { if (matches.isEmpty()) {
return null; return null;
} }