Revert "Merge pull request #6582 from vespa-engine/revert-6557-revert-6553-revert-6512-henrhoi/object-structured-grouping"

This reverts commit 506ea9c1367748ddd4ff20203fc13211d635f5a6, reversing
changes made to 4f6b34dcf9ad904f0ddb89eb506f5920360d5344.

1 files changed, 12 insertions, 2 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeFunction.java b/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeFunction.java
index faf565647c7..d609800cc1c 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeFunction.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/AttributeFunction.java
@@ -6,6 +6,7 @@ package com.yahoo.search.grouping.request;
  * named attribute in the input {@link com.yahoo.search.result.Hit}.
  *
  * @author Simon Thoresen Hult
+ * @author bratseth
  */
 public class AttributeFunction extends DocumentValue {
 
@@ -17,8 +18,17 @@ public class AttributeFunction extends DocumentValue {
      * @param attributeName the attribute name to assign to this.
      */
     public AttributeFunction(String attributeName) {
-        super("attribute(" + attributeName + ")");
-        name = attributeName;
+        this(null, null, attributeName);
+    }
+
+    private AttributeFunction(String label, Integer level, String attributeName) {
+        super("attribute(" + attributeName + ")", label, level);
+        this.name = attributeName;
+    }
+
+    @Override
+    public AttributeFunction copy() {
+        return new AttributeFunction(getLabel(), getLevelOrNull(), getAttributeName());
     }
 
     /**