Revert "Single searchcluster take 3"

1 files changed, 3 insertions, 2 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java b/container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java
index 1c95a07cdfd..033e567d53a 100644
--- a/container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java
+++ b/container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java
@@ -11,6 +11,7 @@ import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
 import com.yahoo.search.schema.Field;
+import com.yahoo.search.schema.FieldInfo;
 import com.yahoo.search.schema.SchemaInfo;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.search.searchchain.PhaseNames;
@@ -54,7 +55,7 @@ public class QueryValidator extends Searcher {
         public boolean visit(Item item) {
             if (item instanceof HasIndexItem indexItem) {
                 var field = schema.fieldInfo(indexItem.getIndexName());
-                if (field.isEmpty()) return true;
+                if (! field.isPresent()) return true;
                 if (field.get().type().kind() == Field.Type.Kind.TENSOR)
                     throw new IllegalArgumentException("Cannot search for terms in '" + indexItem.getIndexName() +
                                                        "': It is a tensor field");
@@ -75,7 +76,7 @@ public class QueryValidator extends Searcher {
             if (schema.isStreaming()) return true; // prefix is always supported
             if (item instanceof PrefixItem prefixItem) {
                 var field = schema.fieldInfo(prefixItem.getIndexName());
-                if (field.isEmpty()) return true;
+                if (! field.isPresent()) return true;
                 if ( ! field.get().isAttribute())
                     throw new IllegalArgumentException("'" + prefixItem.getIndexName() + "' is not an attribute field: Prefix matching is not supported");
                 if (field.get().isIndex()) // index overrides attribute