1 files changed, 13 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
index 5f2617acf16..569f0d06987 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AndFunction.java
@@ -2,12 +2,14 @@
 package com.yahoo.search.grouping.request;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * This class represents an and-function in a {@link GroupingExpression}. It evaluates to a long that equals the result
  * of and'ing the results of all arguments together in the order they were given to the constructor.
  *
  * @author Simon Thoresen Hult
+ * @author bratseth
  */
 public class AndFunction extends FunctionNode {
 
@@ -19,11 +21,18 @@ public class AndFunction extends FunctionNode {
      * @param argN The optional arguments, must evaluate to a long.
      */
     public AndFunction(GroupingExpression arg1, GroupingExpression arg2, GroupingExpression... argN) {
-        this(asList(arg1, arg2, argN));
+        this(null, null, asList(arg1, arg2, argN));
     }
 
-    private AndFunction(List<GroupingExpression> args) {
-        super("and", args);
+    private AndFunction(String label, Integer level, List<GroupingExpression> args) {
+        super("and", label, level, args);
+    }
+
+    @Override
+    public AndFunction copy() {
+        return new AndFunction(getLabel(),
+                               getLevelOrNull(),
+                               args().stream().map(arg -> arg.copy()).collect(Collectors.toList()));
     }
 
     /**
@@ -37,6 +46,6 @@ public class AndFunction extends FunctionNode {
         if (args.size() < 2) {
             throw new IllegalArgumentException("Expected 2 or more arguments, got " + args.size() + ".");
         }
-        return new AndFunction(args);
+        return new AndFunction(null, null, args);
     }
 }