Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller

1 files changed, 2 insertions, 3 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ExpressionCountAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ExpressionCountAggregationResult.java
index 4d45f5785b7..9242e01076c 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ExpressionCountAggregationResult.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ExpressionCountAggregationResult.java
@@ -1,4 +1,4 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchlib.aggregation;
 
 import com.yahoo.searchlib.aggregation.hll.*;
@@ -15,7 +15,7 @@ import com.yahoo.vespa.objects.Serializer;
  */
 public class ExpressionCountAggregationResult extends AggregationResult {
 
-    public static final int classId = registerClass(0x4000 + 88, ExpressionCountAggregationResult.class);
+    public static final int classId = registerClass(0x4000 + 88, ExpressionCountAggregationResult.class, ExpressionCountAggregationResult::new);
     private static final int UNDEFINED = -1;
 
     // The unique count estimator
@@ -29,7 +29,6 @@ public class ExpressionCountAggregationResult extends AggregationResult {
 
 
     /** Constructor used for deserialization. Will be instantiated with a default sketch. */
-    @SuppressWarnings("UnusedDeclaration")
     public ExpressionCountAggregationResult() {
         this(new SparseSketch(), new HyperLogLogEstimator());
     }