1 files changed, 15 insertions, 12 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java b/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
index 5250f264423..a211d4960f4 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/GroupingRequest.java
@@ -34,10 +34,10 @@ public class GroupingRequest {
     private final List<Continuation> continuations = new ArrayList<>();
     private GroupingOperation root;
     private TimeZone timeZone;
-    private int defaultMaxHits = -1;
-    private int defaultMaxGroups = -1;
-    private long globalMaxGroups = -1;
-    private double defaultPrecisionFactor = -1;
+    private Integer defaultMaxHits;
+    private Integer defaultMaxGroups;
+    private Long globalMaxGroups;
+    private Double defaultPrecisionFactor;
 
     private GroupingRequest(Select parent) {
         this.parent = parent;
@@ -47,9 +47,10 @@ public class GroupingRequest {
                             List<Continuation> continuations,
                             GroupingOperation root,
                             TimeZone timeZone,
-                            int defaultMaxHits,
-                            int defaultMaxGroups,
-                            long globalMaxGroups) {
+                            Integer defaultMaxHits,
+                            Integer defaultMaxGroups,
+                            Long globalMaxGroups,
+                            Double defaultPrecisionFactor) {
         this.parent = parent;
         continuations.forEach(item -> this.continuations.add(item.copy()));
         this.root = root != null ? root.copy(null) : null;
@@ -57,11 +58,13 @@ public class GroupingRequest {
         this.defaultMaxHits = defaultMaxHits;
         this.defaultMaxGroups = defaultMaxGroups;
         this.globalMaxGroups = globalMaxGroups;
+        this.defaultPrecisionFactor = defaultPrecisionFactor;
     }
 
     /** Returns a deep copy of this */
     public GroupingRequest copy(Select parentOfCopy) {
-        return new GroupingRequest(parentOfCopy, continuations, root, timeZone, defaultMaxHits, defaultMaxGroups, globalMaxGroups);
+        return new GroupingRequest(parentOfCopy, continuations, root, timeZone, defaultMaxHits, defaultMaxGroups,
+                globalMaxGroups, defaultPrecisionFactor);
     }
 
     /**
@@ -147,28 +150,28 @@ public class GroupingRequest {
 
     @Beta
     public OptionalInt defaultMaxHits() {
-        return defaultMaxHits >= 0 ? OptionalInt.of(defaultMaxHits) : OptionalInt.empty();
+        return defaultMaxHits != null ? OptionalInt.of(defaultMaxHits) : OptionalInt.empty();
     }
 
     @Beta public void setDefaultMaxHits(int v) { this.defaultMaxHits = v; }
 
     @Beta
     public OptionalInt defaultMaxGroups() {
-        return defaultMaxGroups >= 0 ? OptionalInt.of(defaultMaxGroups) : OptionalInt.empty();
+        return defaultMaxGroups != null ? OptionalInt.of(defaultMaxGroups) : OptionalInt.empty();
     }
 
     @Beta public void setDefaultMaxGroups(int v) { this.defaultMaxGroups = v; }
 
     @Beta
     public OptionalLong globalMaxGroups() {
-        return globalMaxGroups >= 0 ? OptionalLong.of(globalMaxGroups) : OptionalLong.empty();
+        return globalMaxGroups != null ? OptionalLong.of(globalMaxGroups) : OptionalLong.empty();
     }
 
     @Beta public void setGlobalMaxGroups(long v) { this.globalMaxGroups = v; }
 
     @Beta
     public OptionalDouble defaultPrecisionFactor() {
-        return defaultPrecisionFactor > 0 ? OptionalDouble.of(defaultPrecisionFactor) : OptionalDouble.empty();
+        return defaultPrecisionFactor != null ? OptionalDouble.of(defaultPrecisionFactor) : OptionalDouble.empty();
     }
 
     @Beta void setDefaultPrecisionFactor(double v) { this.defaultPrecisionFactor = v; }