diff options
Diffstat (limited to 'container-search/src/main/java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java | 4 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java index 602239eb427..2c05f2e7edf 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java @@ -44,7 +44,7 @@ public abstract class CompositeItem extends Item { Item possibleCycle = i.next(); if (this == possibleCycle) { - throw new QueryException("Tried to create a cycle in a tree."); + throw new QueryException("Cannot add " + item + " to " + this + " as it would create a cycle"); } else if (possibleCycle instanceof CompositeItem) { ensureNotInSubtree((CompositeItem) possibleCycle); } @@ -57,7 +57,7 @@ public abstract class CompositeItem extends Item { } protected void adding(Item item) { - Validator.ensureNotNull("Composite item", item); + Validator.ensureNotNull("A composite item child", item); Validator.ensure("Attempted to add a composite to itself", item != this); if (item instanceof CompositeItem) { ensureNotInSubtree((CompositeItem) item); diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java b/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java index 05623570dd4..58486c98dbd 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/LowercasingSearcher.java @@ -9,11 +9,9 @@ import com.yahoo.search.Searcher; import com.yahoo.search.searchchain.Execution; import java.util.ArrayList; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import static com.yahoo.language.LinguisticsCase.toLowerCase; |