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

1 files changed, 4 insertions, 5 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java
index 1b739fe005f..e95caff7435 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.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.expression;
 
 import com.yahoo.vespa.objects.Deserializer;
@@ -11,16 +11,15 @@ import java.util.ArrayList;
  */
 public class RawBucketResultNodeVector extends ResultNodeVector {
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 126, RawBucketResultNodeVector.class);
-    private ArrayList<RawBucketResultNode> vector = new ArrayList<RawBucketResultNode>();
+    public static final int classId = registerClass(0x4000 + 126, RawBucketResultNodeVector.class, RawBucketResultNodeVector::new);
+    private ArrayList<RawBucketResultNode> vector = new ArrayList<>();
 
     @Override
     protected int onGetClassId() {
         return classId;
     }
 
-    public RawBucketResultNodeVector() {
-    }
+    public RawBucketResultNodeVector() {}
 
     public RawBucketResultNodeVector add(RawBucketResultNode v) {
         vector.add(v);