Set default max query items

- Set default max query items to 10000
- Disallow setting maxQueryItems in requests
- Include maxQueryItems in the Query query profile type

1 files changed, 1 insertions, 5 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index af6374ba245..54d8ac40556 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -580,11 +580,7 @@ public class SearchHandler extends LoggingRequestHandler {
     }
 
     private Result validateQuery(Query query) {
-        if (query.getHttpRequest().getProperty(DefaultProperties.MAX_HITS.toString()) != null)
-            throw new RuntimeException(DefaultProperties.MAX_HITS + " must be specified in a query profile.");
-
-        if (query.getHttpRequest().getProperty(DefaultProperties.MAX_OFFSET.toString()) != null)
-            throw new RuntimeException(DefaultProperties.MAX_OFFSET + " must be specified in a query profile.");
+        DefaultProperties.requireNotPresentIn(query.getHttpRequest().propertyMap());
 
         int maxHits = query.properties().getInteger(DefaultProperties.MAX_HITS);
         int maxOffset = query.properties().getInteger(DefaultProperties.MAX_OFFSET);