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.

4 files changed, 13 insertions, 11 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfile.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfile.java
index b6b03d37da8..6008b046d1a 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfile.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfile.java
@@ -4,6 +4,7 @@ package com.yahoo.search.query.profile;
 import com.google.common.collect.ImmutableList;
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.provider.FreezableSimpleComponent;
+import com.yahoo.processing.IllegalInputException;
 import com.yahoo.processing.request.CompoundName;
 import com.yahoo.processing.request.Properties;
 import com.yahoo.search.query.profile.compiled.CompiledQueryProfile;
@@ -451,7 +452,7 @@ public class QueryProfile extends FreezableSimpleComponent implements Cloneable
             setNode(name, value, null, binding, registry);
         }
         catch (IllegalArgumentException e) {
-            throw new IllegalArgumentException("Could not set '" + name + "' to '" + value + "'", e);
+            throw new IllegalInputException("Could not set '" + name + "' to '" + value + "'", e);
         }
     }
 
@@ -688,15 +689,15 @@ public class QueryProfile extends FreezableSimpleComponent implements Cloneable
         FieldDescription fieldDescription = type.getField(localName);
         if (fieldDescription == null) {
             if (type.isStrict())
-                throw new IllegalArgumentException("'" + localName + "' is not declared in " + type + ", and the type is strict");
+                throw new IllegalInputException("'" + localName + "' is not declared in " + type + ", and the type is strict");
             return value;
         }
 
         if (registry == null && (fieldDescription.getType() instanceof QueryProfileFieldType))
-            throw new IllegalArgumentException("A registry was not passed: Query profile references is not supported");
+            throw new IllegalInputException("A registry was not passed: Query profile references is not supported");
         Object convertedValue = fieldDescription.getType().convertFrom(value, registry);
         if (convertedValue == null)
-            throw new IllegalArgumentException("'" + value + "' is not a " + fieldDescription.getType().toInstanceDescription());
+            throw new IllegalInputException("'" + value + "' is not a " + fieldDescription.getType().toInstanceDescription());
         return convertedValue;
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java
index d199ee44c9c..41272d695ac 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/QueryProfileProperties.java
@@ -2,6 +2,7 @@
 package com.yahoo.search.query.profile;
 
 import com.yahoo.collections.Pair;
+import com.yahoo.processing.IllegalInputException;
 import com.yahoo.processing.request.CompoundName;
 import com.yahoo.processing.request.properties.PropertyMap;
 import com.yahoo.protect.Validator;
@@ -107,7 +108,7 @@ public class QueryProfileProperties extends Properties {
                     String localName = name.get(i);
                     FieldDescription fieldDescription = type.getField(localName);
                     if (fieldDescription == null && type.isStrict())
-                        throw new IllegalArgumentException("'" + localName + "' is not declared in " + type + ", and the type is strict");
+                        throw new IllegalInputException("'" + localName + "' is not declared in " + type + ", and the type is strict");
 
                     // TODO: In addition to strictness, check legality along the way
 
@@ -115,7 +116,7 @@ public class QueryProfileProperties extends Properties {
                         if (i == name.size() - 1) { // at the end of the path, check the assignment type
                             value = fieldDescription.getType().convertFrom(value, profile.getRegistry());
                             if (value == null)
-                                throw new IllegalArgumentException("'" + value + "' is not a " +
+                                throw new IllegalInputException("'" + value + "' is not a " +
                                                                    fieldDescription.getType().toInstanceDescription());
                         }
                         else if (fieldDescription.getType() instanceof QueryProfileFieldType) {
@@ -129,12 +130,12 @@ public class QueryProfileProperties extends Properties {
 
             if (value instanceof String && value.toString().startsWith("ref:")) {
                 if (profile.getRegistry() == null)
-                    throw new IllegalArgumentException("Runtime query profile references does not work when the " +
+                    throw new IllegalInputException("Runtime query profile references does not work when the " +
                                                        "QueryProfileProperties are constructed without a registry");
                 String queryProfileId = value.toString().substring(4);
                 value = profile.getRegistry().findQueryProfile(queryProfileId);
                 if (value == null)
-                    throw new IllegalArgumentException("Query profile '" + queryProfileId + "' is not found");
+                    throw new IllegalInputException("Query profile '" + queryProfileId + "' is not found");
             }
 
             if (value instanceof CompiledQueryProfile) { // this will be due to one of the two clauses above
@@ -149,7 +150,7 @@ public class QueryProfileProperties extends Properties {
             }
         }
         catch (IllegalArgumentException e) {
-            throw new IllegalArgumentException("Could not set '" + name + "' to '" + value + "'", e);
+            throw new IllegalInputException("Could not set '" + name + "' to '" + value + "'", e);
         }
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java
index 8638a99172f..e873c80add1 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/compiled/Binding.java
@@ -33,7 +33,6 @@ public class Binding implements Comparable<Binding> {
 
     private final int hashCode;
 
-    @SuppressWarnings("unchecked")
     public static final Binding nullBinding = new Binding(Integer.MAX_VALUE, Collections.<String,String>emptyMap());
 
     public static Binding createFrom(DimensionBinding dimensionBinding) {
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/types/FieldDescription.java b/container-search/src/main/java/com/yahoo/search/query/profile/types/FieldDescription.java
index 6c30f1a8b05..daab5f6a378 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/types/FieldDescription.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/types/FieldDescription.java
@@ -97,7 +97,8 @@ public class FieldDescription implements Comparable<FieldDescription> {
         this.type = type;
 
         // Forbidden until we can figure out the right semantics
-        if (name.isCompound() && ! aliases.isEmpty()) throw new IllegalArgumentException("Aliases are not allowed with compound names");
+        if (name.isCompound() && ! aliases.isEmpty())
+            throw new IllegalArgumentException("Aliases are not allowed with compound names");
 
         this.aliases = ImmutableList.copyOf(aliases);
         this.mandatory = mandatory;