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

NIFI-141: 

- Removing the use of PreparedQueries when searching as it should be considering the raw form (not the evaluated form).
This commit is contained in:
Matt Gilman 2014-12-09 12:42:55 -05:00
parent 1120b0f1ab
commit 457787cde0
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,11 +16,8 @@
*/ */
package org.apache.nifi.web.controller; package org.apache.nifi.web.controller;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.apache.nifi.attribute.expression.language.PreparedQuery;
import org.apache.nifi.attribute.expression.language.Query;
import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue; import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.controller.ControllerServiceLookup; import org.apache.nifi.controller.ControllerServiceLookup;
@ -36,24 +33,11 @@ public class StandardSearchContext implements SearchContext {
private final String searchTerm; private final String searchTerm;
private final ProcessorNode processorNode; private final ProcessorNode processorNode;
private final ControllerServiceLookup controllerServiceLookup; private final ControllerServiceLookup controllerServiceLookup;
private final Map<PropertyDescriptor, PreparedQuery> preparedQueries;
public StandardSearchContext(final String searchTerm, final ProcessorNode processorNode, final ControllerServiceLookup controllerServiceLookup) { public StandardSearchContext(final String searchTerm, final ProcessorNode processorNode, final ControllerServiceLookup controllerServiceLookup) {
this.searchTerm = searchTerm; this.searchTerm = searchTerm;
this.processorNode = processorNode; this.processorNode = processorNode;
this.controllerServiceLookup = controllerServiceLookup; this.controllerServiceLookup = controllerServiceLookup;
preparedQueries = new HashMap<>();
for (final Map.Entry<PropertyDescriptor, String> entry : processorNode.getProperties().entrySet()) {
final PropertyDescriptor desc = entry.getKey();
String value = entry.getValue();
if (value == null) {
value = desc.getDefaultValue();
}
final PreparedQuery pq = Query.prepare(value);
preparedQueries.put(desc, pq);
}
} }
@Override @Override
@ -69,7 +53,7 @@ public class StandardSearchContext implements SearchContext {
@Override @Override
public PropertyValue getProperty(PropertyDescriptor property) { public PropertyValue getProperty(PropertyDescriptor property) {
final String configuredValue = processorNode.getProperty(property); final String configuredValue = processorNode.getProperty(property);
return new StandardPropertyValue(configuredValue == null ? property.getDefaultValue() : configuredValue, controllerServiceLookup, preparedQueries.get(property)); return new StandardPropertyValue(configuredValue == null ? property.getDefaultValue() : configuredValue, controllerServiceLookup, null);
} }
@Override @Override