summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-04-09 13:50:33 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-04-09 13:50:33 +0200
commit7049a3e1d95c655938a2b771047f2bfce900933b (patch)
treefda4734294b7ae3db6dc89fd01ec8a89acb8dda8 /container-search
parentd623049d2ba3b12c90a1592580e4b4f238f14731 (diff)
Don't use deprecated method
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java5
-rw-r--r--container-search/src/main/java/com/yahoo/search/querytransform/WandSearcher.java3
2 files changed, 4 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java
index 21bc22d7002..f77301f587c 100644
--- a/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/querytransform/BooleanSearcher.java
@@ -20,7 +20,8 @@ import static com.yahoo.yolean.Exceptions.toMessageString;
/**
* Searcher that builds a PredicateItem from the &amp;boolean properties and inserts it into a query.
- * @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a>
+ *
+ * @author Magnar Nedland
*/
@After({ STEMMING, ACCENT_REMOVAL })
@Provides(BooleanSearcher.PREDICATE)
@@ -74,7 +75,7 @@ public class BooleanSearcher extends Searcher {
item.setIndexName(fieldName);
new PredicateValueAttributeParser(item).parse(attributes);
new PredicateRangeAttributeParser(item).parse(rangeAttributes);
- QueryTreeUtil.andQueryItemWithRoot(query, item);
+ query.getModel().getQueryTree().and(item);
}
static public class PredicateValueAttributeParser extends BooleanAttributeParser {
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/WandSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/WandSearcher.java
index cda41f5f62e..0b1387a16a2 100644
--- a/container-search/src/main/java/com/yahoo/search/querytransform/WandSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/querytransform/WandSearcher.java
@@ -15,7 +15,6 @@ import com.yahoo.text.MapParser;
import java.util.LinkedHashMap;
import java.util.Map;
-import static com.yahoo.container.protect.Error.UNSPECIFIED;
import com.yahoo.yolean.Exceptions;
/**
@@ -147,7 +146,7 @@ public class WandSearcher extends Searcher {
InputResolver inputs = new InputResolver(query, execution);
if ( ! inputs.hasValidData()) return execution.search(query);
- QueryTreeUtil.andQueryItemWithRoot(query, createWandQueryItem(inputs));
+ query.getModel().getQueryTree().and(createWandQueryItem(inputs));
query.trace("WandSearcher: Added WAND operator", true, 4);
return execution.search(query);
}