1 files changed, 14 insertions, 13 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java
index 0d6a06961d1..88490237fc7 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.query.parser;
 
+import com.yahoo.collections.Pair;
 import com.yahoo.prelude.IndexFacts;
 import com.yahoo.prelude.query.AndItem;
 import com.yahoo.prelude.query.AndSegmentItem;
@@ -69,19 +70,22 @@ abstract class StructuredParser extends AbstractParser {
         submodes.setFromIndex(indexName, indexFacts);
     }
 
-    protected Item indexableItem() {
-        return indexableItem(null);
-    }
-
-    protected Item indexableItem(String defaultIndexName) {
+    /**
+     * Returns an item and whether it had an explicit index ('indexname:' prefix).
+     *
+     * @return an item and whether it has an explicit index, or a Pair with the first element null if none
+     */
+    protected Pair<Item, Boolean> indexableItem() {
         int position = tokens.getPosition();
         Item item = null;
 
         try {
+            boolean explicitIndex = false;
             String indexName = indexPrefix();
-            if (Objects.isNull(indexName)) {
-                indexName = defaultIndexName;
-            }
+            if (indexName != null)
+                explicitIndex = true;
+            else
+                indexName = this.defaultIndex;
             setSubmodeFromIndex(indexName, indexFacts);
 
             item = number();
@@ -103,7 +107,6 @@ abstract class StructuredParser extends AbstractParser {
             if (item != null) {
                 weight = weightSuffix();
             }
-
             if (indexName != null && item != null) {
                 item.setIndexName(indexName);
             }
@@ -112,7 +115,7 @@ abstract class StructuredParser extends AbstractParser {
                 item.setWeight(weight);
             }
 
-            return item;
+            return new Pair<>(item, explicitIndex);
         } finally {
             if (item == null) {
                 tokens.setPosition(position);
@@ -126,8 +129,7 @@ abstract class StructuredParser extends AbstractParser {
             if (tokens.currentIsNoIgnore(SPACE)) {
                 return false;
             }
-            if (tokens.currentIsNoIgnore(NUMBER)
-                    || tokens.currentIsNoIgnore(WORD)) {
+            if (tokens.currentIsNoIgnore(NUMBER) || tokens.currentIsNoIgnore(WORD)) {
                 return true;
             }
             tokens.skipNoIgnore();
@@ -303,7 +305,6 @@ abstract class StructuredParser extends AbstractParser {
             tokens.skip(LSQUAREBRACKET);
             if (item == null)
                 tokens.skipNoIgnore(SPACE);
-
             // TODO: Better definition of start and end of numeric items
             if (item == null && tokens.currentIsNoIgnore(MINUS) && (tokens.currentNoIgnore(1).kind == NUMBER)) {
                 tokens.skipNoIgnore();