Skip logging only for IllegalInputException

- Add IllegalInputException to signal cases where we know the exception
  is caused by illegal input received from the requestor.
- Only skip logging for IllegalInputException instead of the superclass
  IllegalArgumentException as that is also used to signal illegal
  arguments to methods due to bugs which are otherwise hard to debug.
- Throw IllegalInputException rather than IllegalArgumentException
  where appropriate.
- Deprecated QueryException as it was only used to be able to separate
  between query string and query parameter exceptions, and not doing
  that consistently, and is in a package we don't want more use of.
- Clean up some cases where the wrong exception was thrown.

1 files changed, 7 insertions, 6 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java b/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java
index 06b030dbc78..cd8578cd728 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java
@@ -5,6 +5,7 @@ import com.google.inject.Inject;
 import com.yahoo.component.chain.dependencies.After;
 import com.yahoo.component.chain.dependencies.Before;
 import com.yahoo.component.chain.dependencies.Provides;
+import com.yahoo.processing.IllegalInputException;
 import com.yahoo.search.grouping.request.AttributeMapLookupValue;
 import com.yahoo.vespa.config.search.AttributesConfig;
 import com.yahoo.container.QrSearchersConfig;
@@ -80,14 +81,14 @@ public class GroupingValidator extends Searcher {
         AttributesConfig.Attribute keyAttribute = attributes.get(keyAttributeName);
         AttributesConfig.Attribute keySourceAttribute = attributes.get(keySourceAttributeName);
         if (!keySourceAttribute.datatype().equals(keyAttribute.datatype())) {
-            throw new IllegalArgumentException("Grouping request references key source attribute '" +
-                    keySourceAttributeName + "' with data type '" + keySourceAttribute.datatype() +
-                    "' that is different than data type '" + keyAttribute.datatype() + "' of key attribute '" +
-                    keyAttributeName + "'");
+            throw new IllegalInputException("Grouping request references key source attribute '" +
+                                            keySourceAttributeName + "' with data type '" + keySourceAttribute.datatype() +
+                                            "' that is different than data type '" + keyAttribute.datatype() + "' of key attribute '" +
+                                            keyAttributeName + "'");
         }
         if (!keySourceAttribute.collectiontype().equals(AttributesConfig.Attribute.Collectiontype.Enum.SINGLE)) {
-            throw new IllegalArgumentException("Grouping request references key source attribute '" +
-                    keySourceAttributeName + "' which is not of single value type");
+            throw new IllegalInputException("Grouping request references key source attribute '" +
+                                            keySourceAttributeName + "' which is not of single value type");
         }
     }