Avoid reflection by providing explicit construction

64 files changed, 125 insertions, 265 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java
index f7106d353d5..722d78a23db 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java
@@ -18,7 +18,7 @@ import java.util.List;
 
 public class Group extends Identifiable {
 
-    public static final int classId = registerClass(0x4000 + 90, Group.class);
+    public static final int classId = registerClass(0x4000 + 90, Group.class, Group::new);
     private static final ObjectPredicate REF_LOCATOR = new RefLocator();
     private static final int MAX_AGGREGATIONS = 0x10000; // Backend limitation
     private static final int MAX_ORDERBY_EXPRESSIONS = 8; // Backend limitation
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java
index 2faee4ede3d..fa3e307cb4a 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java
@@ -24,7 +24,7 @@ public class Grouping extends Identifiable {
     }
 
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 91, Grouping.class);
+    public static final int classId = registerClass(0x4000 + 91, Grouping.class, Grouping::new);
 
     // The client id for this grouping request.
     private int id = 0;
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/GroupingLevel.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/GroupingLevel.java
index ae7def70382..89f552f0bfe 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/GroupingLevel.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/GroupingLevel.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer;
 public class GroupingLevel extends Identifiable {
 
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 93, GroupingLevel.class);
+    public static final int classId = registerClass(0x4000 + 93, GroupingLevel.class, GroupingLevel::new);
 
     // The maximum number of groups allowed at this level.
     private long maxGroups = -1;
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java
index d7b465e230c..c27c509fa94 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java
@@ -18,7 +18,7 @@ import java.util.Arrays;
  */
 public class NormalSketch extends Sketch<NormalSketch>  {
 
-    public static final int classId = registerClass(0x4000 + 170, NormalSketch.class);
+    public static final int classId = registerClass(0x4000 + 170, NormalSketch.class, NormalSketch::new);
 
     private final byte[] data;
     private final int bucketMask;
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java
index 2cff70b9e30..84896b359ef 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java
@@ -8,7 +8,7 @@ import java.util.HashSet;
 
 public class SparseSketch extends Sketch<SparseSketch> {
 
-    public static final int classId = registerClass(0x4000 + 171, SparseSketch.class);
+    public static final int classId = registerClass(0x4000 + 171, SparseSketch.class, SparseSketch::new);
     private final HashSet<Integer> values = new HashSet<>();
 
     @Override
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java
index 17524459fff..33579171650 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/AddFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class AddFunctionNode extends NumericFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 61, AddFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 61, AddFunctionNode.class, AddFunctionNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java
index efbcc193057..88ef0f1b7e9 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/AndFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class AndFunctionNode extends BitFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 67, AndFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 67, AndFunctionNode.class, AndFunctionNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ArrayAtLookupNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ArrayAtLookupNode.java
index 6fe6a57b7f9..572063eb83f 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ArrayAtLookupNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ArrayAtLookupNode.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.objects.Serializer;
  */
 public class ArrayAtLookupNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 38, ArrayAtLookupNode.class);
+    public static final int classId = registerClass(0x4000 + 38, ArrayAtLookupNode.class, ArrayAtLookupNode::new);
     private String attribute;
 
     /**
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeMapLookupNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeMapLookupNode.java
index 580a5b0db8e..719ebcad6e1 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeMapLookupNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/AttributeMapLookupNode.java
@@ -17,7 +17,7 @@ import java.util.Objects;
  */
 public class AttributeMapLookupNode extends AttributeNode {
 
-    public static final int classId = registerClass(0x4000 + 145, AttributeMapLookupNode.class);
+    public static final int classId = registerClass(0x4000 + 145, AttributeMapLookupNode.class, AttributeMapLookupNode::new);
     private String keyAttribute = "";
     private String valueAttribute = "";
     private String key = "";
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/BoolResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/BoolResultNode.java
index 1a7a2a91741..b19639a62c1 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/BoolResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/BoolResultNode.java
@@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer;
 import java.nio.ByteBuffer;
 
 public class BoolResultNode extends ResultNode {
-    public static final int classId = registerClass(0x4000 + 146, BoolResultNode.class);
+    public static final int classId = registerClass(0x4000 + 146, BoolResultNode.class, BoolResultNode::new);
     private boolean value = false;
 
     public BoolResultNode() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/BoolResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/BoolResultNodeVector.java
index fe438042ce3..62a57db17d0 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/BoolResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/BoolResultNodeVector.java
@@ -7,7 +7,7 @@ import com.yahoo.vespa.objects.Serializer;
 import java.util.ArrayList;
 
 public class BoolResultNodeVector extends ResultNodeVector {
-    public static final int classId = registerClass(0x4000 + 147, BoolResultNodeVector.class);
+    public static final int classId = registerClass(0x4000 + 147, BoolResultNodeVector.class, BoolResultNodeVector::new);
     private ArrayList<BoolResultNode> vector = new ArrayList<>();
 
     public BoolResultNodeVector() {}
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java
index 81c8cb3ae6b..2447603d0b2 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/CatFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class CatFunctionNode extends MultiArgFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 72, CatFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 72, CatFunctionNode.class, CatFunctionNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/DebugWaitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/DebugWaitFunctionNode.java
index 97f34d2a96b..0201434ff57 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/DebugWaitFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/DebugWaitFunctionNode.java
@@ -12,14 +12,11 @@ import com.yahoo.vespa.objects.Serializer;
  */
 public class DebugWaitFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 144, DebugWaitFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 144, DebugWaitFunctionNode.class, DebugWaitFunctionNode::new);
     private double waitTime;
     private boolean busyWait;
 
-    @SuppressWarnings("UnusedDeclaration")
-    public DebugWaitFunctionNode() {
-        // used by deserializer
-    }
+    public DebugWaitFunctionNode() { }
 
     /**
      * Constructs an instance of this class with given argument and wait parameters.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java
index 07729d80053..97eded1d38f 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/DivideFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class DivideFunctionNode extends NumericFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 63, DivideFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 63, DivideFunctionNode.class, DivideFunctionNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java
index 473d31bdac0..02e1ad13fc8 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/DocumentFieldNode.java
@@ -13,7 +13,7 @@ import com.yahoo.vespa.objects.Serializer;
  */
 public class DocumentFieldNode extends DocumentAccessorNode {
 
-    public static final int classId = registerClass(0x4000 + 56, DocumentFieldNode.class);
+    public static final int classId = registerClass(0x4000 + 56, DocumentFieldNode.class, DocumentFieldNode::new);
     private String fieldName;
     private ResultNode result;
 
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FixedWidthBucketFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FixedWidthBucketFunctionNode.java
index cfd8fc774a6..20b9d1528ed 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FixedWidthBucketFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FixedWidthBucketFunctionNode.java
@@ -13,7 +13,7 @@ import com.yahoo.vespa.objects.Serializer;
  */
 public class FixedWidthBucketFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 77, FixedWidthBucketFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 77, FixedWidthBucketFunctionNode.class, FixedWidthBucketFunctionNode::new);
     private NumericResultNode width = null;
 
     /**
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNode.java
index b8f1431c8eb..a4191a78abd 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNode.java
@@ -14,7 +14,7 @@ import com.yahoo.vespa.objects.Serializer;
 public class FloatBucketResultNode extends BucketResultNode {
 
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 102, FloatBucketResultNode.class);
+    public static final int classId = registerClass(0x4000 + 102, FloatBucketResultNode.class, FloatBucketResultNode::new);
 
     // bucket start, inclusive
     private double from = 0;
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java
index 6a72b2f3787..901a0d39bbb 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatBucketResultNodeVector.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
 public class FloatBucketResultNodeVector extends ResultNodeVector {
 
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 113, FloatBucketResultNodeVector.class);
+    public static final int classId = registerClass(0x4000 + 113, FloatBucketResultNodeVector.class, FloatBucketResultNodeVector::new);
     private ArrayList<FloatBucketResultNode> vector = new ArrayList<FloatBucketResultNode>();
 
     @Override
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java
index d5e69547346..b5ea963f817 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNodeVector.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
 public class FloatResultNodeVector extends ResultNodeVector {
 
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 110, FloatResultNodeVector.class);
+    public static final int classId = registerClass(0x4000 + 110, FloatResultNodeVector.class, FloatResultNodeVector::new);
     private ArrayList<FloatResultNode> vector = new ArrayList<FloatResultNode>();
 
     @Override
@@ -23,8 +23,7 @@ public class FloatResultNodeVector extends ResultNodeVector {
         return classId;
     }
 
-    public FloatResultNodeVector() {
-    }
+    public FloatResultNodeVector() {}
 
     public FloatResultNodeVector add(FloatResultNode v) {
         vector.add(v);
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java
index 3988956d0eb..4f94d740ddf 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/GetDocIdNamespaceSpecificFunctionNode.java
@@ -13,7 +13,7 @@ import com.yahoo.vespa.objects.Serializer;
  */
 public class GetDocIdNamespaceSpecificFunctionNode extends DocumentAccessorNode {
 
-    public static final int classId = registerClass(0x4000 + 73, GetDocIdNamespaceSpecificFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 73, GetDocIdNamespaceSpecificFunctionNode.class, GetDocIdNamespaceSpecificFunctionNode::new);
     private ResultNode result = null;
 
     /**
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java
index e3fdcf5ff51..42405e4027c 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java
@@ -18,10 +18,7 @@ public class Int16ResultNode extends NumericResultNode {
     public static final int classId = registerClass(0x4000 + 105, Int16ResultNode.class, Int16ResultNode::new);
     private short value = 0;
 
-    @SuppressWarnings("UnusedDeclaration")
-    public Int16ResultNode() {
-        // used by deserializer
-    }
+    public Int16ResultNode() {}
 
     /**
      * Constructs an instance of this class with given value.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java
index 4e411985e66..9aea52250f9 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNodeVector.java
@@ -14,11 +14,10 @@ import java.util.ArrayList;
  */
 public class Int16ResultNodeVector extends ResultNodeVector {
 
-    public static final int classId = registerClass(0x4000 + 117, Int16ResultNodeVector.class);
+    public static final int classId = registerClass(0x4000 + 117, Int16ResultNodeVector.class, Int16ResultNodeVector::new);
     private ArrayList<Int16ResultNode> vector = new ArrayList<Int16ResultNode>();
 
-    public Int16ResultNodeVector() {
-    }
+    public Int16ResultNodeVector() {}
 
     public Int16ResultNodeVector add(Int16ResultNode v) {
         vector.add(v);
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java
index 8714cce52f6..6fad7f5d9ae 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNodeVector.java
@@ -14,12 +14,10 @@ import java.util.ArrayList;
  */
 public class Int32ResultNodeVector extends ResultNodeVector {
 
-    public static final int classId = registerClass(0x4000 + 118, Int32ResultNodeVector.class);
+    public static final int classId = registerClass(0x4000 + 118, Int32ResultNodeVector.class, Int32ResultNodeVector::new);
     private ArrayList<Int32ResultNode> vector = new ArrayList<Int32ResultNode>();
 
-    public Int32ResultNodeVector() {
-
-    }
+    public Int32ResultNodeVector() {}
 
     public Int32ResultNodeVector add(Int32ResultNode v) {
         vector.add(v);
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java
index 05b844bd996..a2c64c931dc 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java
@@ -18,8 +18,7 @@ public class Int8ResultNode extends NumericResultNode {
     public static final int classId = registerClass(0x4000 + 104, Int8ResultNode.class, Int8ResultNode::new);
     private byte value = 0;
 
-    public Int8ResultNode() {
-    }
+    public Int8ResultNode() { }
 
     /**
      * Constructs an instance of this class with given value.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java
index 2d00fcd2d61..a2639fa1513 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNodeVector.java
@@ -14,12 +14,10 @@ import java.util.ArrayList;
  */
 public class Int8ResultNodeVector extends ResultNodeVector {
 
-    public static final int classId = registerClass(0x4000 + 116, Int8ResultNodeVector.class);
+    public static final int classId = registerClass(0x4000 + 116, Int8ResultNodeVector.class, Int8ResultNodeVector::new);
     private ArrayList<Int8ResultNode> vector = new ArrayList<>();
 
-    public Int8ResultNodeVector() {
-
-    }
+    public Int8ResultNodeVector() {}
 
     public Int8ResultNodeVector add(Int8ResultNode v) {
         vector.add(v);
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNode.java
index a70c7b15b0c..532ae999480 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNode.java
@@ -13,16 +13,11 @@ import com.yahoo.vespa.objects.Serializer;
  */
 public class IntegerBucketResultNode extends BucketResultNode {
 
-    public static final int classId = registerClass(0x4000 + 101, IntegerBucketResultNode.class);
+    public static final int classId = registerClass(0x4000 + 101, IntegerBucketResultNode.class, IntegerBucketResultNode::new);
     private long from = 0; // bucket start, inclusive
     private long to = 0; // bucket end, exclusive
 
-    /**
-     * Constructs an empty result node.
-     */
-    public IntegerBucketResultNode() {
-        // empty
-    }
+    public IntegerBucketResultNode() { }
 
     /**
      * Create a bucket with the given limits
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java
index db33cd081c8..091da38c524 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerBucketResultNodeVector.java
@@ -14,12 +14,10 @@ import java.util.ArrayList;
  */
 public class IntegerBucketResultNodeVector extends ResultNodeVector {
 
-    public static final int classId = registerClass(0x4000 + 112, IntegerBucketResultNodeVector.class);
-    private ArrayList<IntegerBucketResultNode> vector = new ArrayList<IntegerBucketResultNode>();
+    public static final int classId = registerClass(0x4000 + 112, IntegerBucketResultNodeVector.class, IntegerBucketResultNodeVector::new);
+    private ArrayList<IntegerBucketResultNode> vector = new ArrayList<>();
 
-    public IntegerBucketResultNodeVector() {
-
-    }
+    public IntegerBucketResultNodeVector() {}
 
     public IntegerBucketResultNodeVector add(IntegerBucketResultNode v) {
         vector.add(v);
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java
index a840e74ede8..776213c47d0 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNodeVector.java
@@ -14,12 +14,10 @@ import java.util.ArrayList;
  */
 public class IntegerResultNodeVector extends ResultNodeVector {
 
-    public static final int classId = registerClass(0x4000 + 119, IntegerResultNodeVector.class);
-    private ArrayList<IntegerResultNode> vector = new ArrayList<IntegerResultNode>();
+    public static final int classId = registerClass(0x4000 + 119, IntegerResultNodeVector.class, IntegerResultNodeVector::new);
+    private ArrayList<IntegerResultNode> vector = new ArrayList<>();
 
-    public IntegerResultNodeVector() {
-
-    }
+    public IntegerResultNodeVector() {}
 
     public IntegerResultNodeVector add(IntegerResultNode v) {
         vector.add(v);
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/InterpolatedLookupNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/InterpolatedLookupNode.java
index a8175cf32d8..e8ebfad0b0d 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/InterpolatedLookupNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/InterpolatedLookupNode.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.objects.Serializer;
  */
 public class InterpolatedLookupNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 39, InterpolatedLookupNode.class);
+    public static final int classId = registerClass(0x4000 + 39, InterpolatedLookupNode.class, InterpolatedLookupNode::new);
     private String attribute;
 
     /**
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java
index 6940bee45aa..81493a09e98 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MD5BitFunctionNode.java
@@ -9,14 +9,12 @@ package com.yahoo.searchlib.expression;
  */
 public class MD5BitFunctionNode extends UnaryBitFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 70, MD5BitFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 70, MD5BitFunctionNode.class, MD5BitFunctionNode::new);
 
     /**
      * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
      */
-    public MD5BitFunctionNode() {
-
-    }
+    public MD5BitFunctionNode() {}
 
     /**
      * Constructs an instance of this class with given argument and number of bits.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java
index e9d0b3dc069..a19ff9690ea 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MathFunctionNode.java
@@ -53,10 +53,9 @@ public class MathFunctionNode extends MultiArgFunctionNode {
         }
     }
 
-    public static final int classId = registerClass(0x4000 + 136, MathFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 136, MathFunctionNode.class, MathFunctionNode::new);
     private Function fnc;
 
-    @SuppressWarnings("UnusedDeclaration")
     public MathFunctionNode() {
         this(Function.LOG);
     }
@@ -75,69 +74,31 @@ public class MathFunctionNode extends MultiArgFunctionNode {
     @Override
     protected boolean onExecute() {
         getArg(0).execute();
-        double result = 0.0;
-        switch (fnc) {
-        case EXP:
-            result = Math.exp(getArg(0).getResult().getFloat());
-            break;
-        case POW:
-            result = Math.pow(getArg(0).getResult().getFloat(), getArg(1).getResult().getFloat());
-            break;
-        case LOG:
-            result = Math.log(getArg(0).getResult().getFloat());
-            break;
-        case LOG1P:
-            result = Math.log1p(getArg(0).getResult().getFloat());
-            break;
-        case LOG10:
-            result = Math.log10(getArg(0).getResult().getFloat());
-            break;
-        case SIN:
-            result = Math.sin(getArg(0).getResult().getFloat());
-            break;
-        case ASIN:
-            result = Math.asin(getArg(0).getResult().getFloat());
-            break;
-        case COS:
-            result = Math.cos(getArg(0).getResult().getFloat());
-            break;
-        case ACOS:
-            result = Math.acos(getArg(0).getResult().getFloat());
-            break;
-        case TAN:
-            result = Math.tan(getArg(0).getResult().getFloat());
-            break;
-        case ATAN:
-            result = Math.atan(getArg(0).getResult().getFloat());
-            break;
-        case SQRT:
-            result = Math.sqrt(getArg(0).getResult().getFloat());
-            break;
-        case SINH:
-            result = Math.sinh(getArg(0).getResult().getFloat());
-            break;
-        case ASINH:
-            throw new IllegalArgumentException("Inverse hyperbolic sine(asinh) is not supported in java");
-        case COSH:
-            result = Math.cosh(getArg(0).getResult().getFloat());
-            break;
-        case ACOSH:
-            throw new IllegalArgumentException("Inverse hyperbolic cosine (acosh) is not supported in java");
-        case TANH:
-            result = Math.tanh(getArg(0).getResult().getFloat());
-            break;
-        case ATANH:
-            throw new IllegalArgumentException("Inverse hyperbolic tangents (atanh) is not supported in java");
-        case FLOOR:
-            result = Math.floor(getArg(0).getResult().getFloat());
-            break;
-        case CBRT:
-            result = Math.cbrt(getArg(0).getResult().getFloat());
-            break;
-        case HYPOT:
-            result = Math.hypot(getArg(0).getResult().getFloat(), getArg(1).getResult().getFloat());
-            break;
-        }
+        double result = switch (fnc) {
+            case EXP -> Math.exp(getArg(0).getResult().getFloat());
+            case POW -> Math.pow(getArg(0).getResult().getFloat(), getArg(1).getResult().getFloat());
+            case LOG -> Math.log(getArg(0).getResult().getFloat());
+            case LOG1P -> Math.log1p(getArg(0).getResult().getFloat());
+            case LOG10 -> Math.log10(getArg(0).getResult().getFloat());
+            case SIN -> Math.sin(getArg(0).getResult().getFloat());
+            case ASIN -> Math.asin(getArg(0).getResult().getFloat());
+            case COS -> Math.cos(getArg(0).getResult().getFloat());
+            case ACOS -> Math.acos(getArg(0).getResult().getFloat());
+            case TAN -> Math.tan(getArg(0).getResult().getFloat());
+            case ATAN -> Math.atan(getArg(0).getResult().getFloat());
+            case SQRT -> Math.sqrt(getArg(0).getResult().getFloat());
+            case SINH -> Math.sinh(getArg(0).getResult().getFloat());
+            case ASINH -> throw new IllegalArgumentException("Inverse hyperbolic sine(asinh) is not supported in java");
+            case COSH -> Math.cosh(getArg(0).getResult().getFloat());
+            case ACOSH ->
+                    throw new IllegalArgumentException("Inverse hyperbolic cosine (acosh) is not supported in java");
+            case TANH -> Math.tanh(getArg(0).getResult().getFloat());
+            case ATANH ->
+                    throw new IllegalArgumentException("Inverse hyperbolic tangents (atanh) is not supported in java");
+            case FLOOR -> Math.floor(getArg(0).getResult().getFloat());
+            case CBRT -> Math.cbrt(getArg(0).getResult().getFloat());
+            case HYPOT -> Math.hypot(getArg(0).getResult().getFloat(), getArg(1).getResult().getFloat());
+        };
         ((FloatResultNode)getResult()).setValue(result);
         return true;
     }
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java
index e15d77048a6..261fbfedfea 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MaxFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class MaxFunctionNode extends NumericFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 66, MaxFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 66, MaxFunctionNode.class, MaxFunctionNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java
index 71a7dbbb609..972b8181c7a 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MinFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class MinFunctionNode extends NumericFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 65, MinFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 65, MinFunctionNode.class, MinFunctionNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java
index 140ec3134f1..1d17df05e5b 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ModuloFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class ModuloFunctionNode extends NumericFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 64, ModuloFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 64, ModuloFunctionNode.class, ModuloFunctionNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java
index 49d8dd434a3..f7a34c030bd 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiArgFunctionNode.java
@@ -51,16 +51,16 @@ public abstract class MultiArgFunctionNode extends FunctionNode {
 
     @Override
     protected boolean onExecute() {
-        for (int i = 0; i < args.size(); i++) {
-            args.get(i).execute();
+        for (ExpressionNode arg : args) {
+            arg.execute();
         }
         return calculate(args, getResult());
     }
 
     @Override
     protected void onPrepare() {
-        for (int i = 0; i < args.size(); i++) {
-            args.get(i).prepare();
+        for (ExpressionNode arg : args) {
+            arg.prepare();
         }
         prepareResult();
     }
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java
index 2e95d7b4342..64561a7f05d 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/MultiplyFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class MultiplyFunctionNode extends NumericFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 62, MultiplyFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 62, MultiplyFunctionNode.class, MultiplyFunctionNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java
index a68e753f881..5be2ab2f805 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NegateFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class NegateFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 60, NegateFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 60, NegateFunctionNode.class, NegateFunctionNode::new);
 
     /**
      * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java
index 7d99a1002b7..d95b8e45627 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NormalizeSubjectFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class NormalizeSubjectFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 143, NormalizeSubjectFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 143, NormalizeSubjectFunctionNode.class, NormalizeSubjectFunctionNode::new);
 
     /**
      * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java
index 493bea276a9..a32e15e40d5 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NullResultNode.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.objects.ObjectVisitor;
 public class NullResultNode extends ResultNode {
 
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 57, NullResultNode.class);
+    public static final int classId = registerClass(0x4000 + 57, NullResultNode.class, NullResultNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java
index 4186cf44b51..cafbde08b73 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/NumElemFunctionNode.java
@@ -9,14 +9,12 @@ package com.yahoo.searchlib.expression;
  */
 public class NumElemFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 132, NumElemFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 132, NumElemFunctionNode.class, NumElemFunctionNode::new);
 
     /**
      * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
      */
-    public NumElemFunctionNode() {
-
-    }
+    public NumElemFunctionNode() {}
 
     /**
      * Constructs an instance of this class with given argument.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java
index e507441dbbd..bdc149aabce 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/OrFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class OrFunctionNode extends BitFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 68, OrFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 68, OrFunctionNode.class, OrFunctionNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java
index 1d1e5e732fa..d8872ad0e93 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/PositiveInfinityResultNode.java
@@ -6,7 +6,7 @@ package com.yahoo.searchlib.expression;
  */
 public class PositiveInfinityResultNode extends ResultNode {
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 124, PositiveInfinityResultNode.class);
+    public static final int classId = registerClass(0x4000 + 124, PositiveInfinityResultNode.class, PositiveInfinityResultNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RangeBucketPreDefFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RangeBucketPreDefFunctionNode.java
index d6eca94cef1..42f489f69ee 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RangeBucketPreDefFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RangeBucketPreDefFunctionNode.java
@@ -13,15 +13,10 @@ import com.yahoo.vespa.objects.Serializer;
  */
 public class RangeBucketPreDefFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 76, RangeBucketPreDefFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 76, RangeBucketPreDefFunctionNode.class, RangeBucketPreDefFunctionNode::new);
     private ResultNodeVector predef = null;
 
-    /**
-     * Constructs an empty result node.
-     */
-    public RangeBucketPreDefFunctionNode() {
-        // empty
-    }
+    public RangeBucketPreDefFunctionNode() {}
 
     /**
      * Create a bucket expression with the given width and the given subexpression
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java
index 6327c720d07..6d995bc1b34 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNode.java
@@ -11,7 +11,7 @@ import com.yahoo.vespa.objects.Serializer;
 public class RawBucketResultNode extends BucketResultNode {
 
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 125, RawBucketResultNode.class);
+    public static final int classId = registerClass(0x4000 + 125, RawBucketResultNode.class, RawBucketResultNode::new);
 
     // bucket start, inclusive
     private ResultNode from = RawResultNode.getNegativeInfinity();
@@ -24,12 +24,7 @@ public class RawBucketResultNode extends BucketResultNode {
         return to.equals(from);
     }
 
-    /**
-     * Constructs an empty result node.
-     */
-    public RawBucketResultNode() {
-        // empty
-    }
+    public RawBucketResultNode() {}
 
     /**
      * Create a bucket with the given limits
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 e779eb62e17..e95caff7435 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawBucketResultNodeVector.java
@@ -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);
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java
index fb951f4313b..8ea775799a6 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RawResultNodeVector.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
 public class RawResultNodeVector extends ResultNodeVector {
 
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 115, RawResultNodeVector.class);
+    public static final int classId = registerClass(0x4000 + 115, RawResultNodeVector.class, RawResultNodeVector::new);
     private ArrayList<RawResultNode> vector = new ArrayList<RawResultNode>();
 
     @Override
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java
index 1b675d3beca..250c8902fa8 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/RelevanceNode.java
@@ -13,17 +13,13 @@ import com.yahoo.vespa.objects.Serializer;
  */
 public class RelevanceNode extends ExpressionNode {
 
-    public static final int classId = registerClass(0x4000 + 59, RelevanceNode.class);
+    public static final int classId = registerClass(0x4000 + 59, RelevanceNode.class, RelevanceNode::new);
     private FloatResultNode relevance = new FloatResultNode();
 
-    public RelevanceNode() {
-
-    }
+    public RelevanceNode() {}
 
     @Override
-    public void onPrepare() {
-
-    }
+    public void onPrepare() {}
 
     @Override
     public boolean onExecute() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java
index a349da71ee0..bf6d415bbf4 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ReverseFunctionNode.java
@@ -9,14 +9,9 @@ package com.yahoo.searchlib.expression;
  */
 public class ReverseFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 138, ReverseFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 138, ReverseFunctionNode.class, ReverseFunctionNode::new);
 
-    /**
-     * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
-     */
-    public ReverseFunctionNode() {
-
-    }
+    public ReverseFunctionNode() {}
 
     /**
      * Constructs an instance of this class with given argument.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java
index a84cf25158e..d6780a29e74 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/SortFunctionNode.java
@@ -6,14 +6,9 @@ package com.yahoo.searchlib.expression;
  */
 public class SortFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 137, SortFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 137, SortFunctionNode.class, SortFunctionNode::new);
 
-    /**
-     * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
-     */
-    public SortFunctionNode() {
-
-    }
+    public SortFunctionNode() {}
 
     /**
      * Constructs an instance of this class with given argument.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java
index a1164402705..0b8a07afac3 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrCatFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class StrCatFunctionNode extends MultiArgFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 133, StrCatFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 133, StrCatFunctionNode.class, StrCatFunctionNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java
index 406a77d2c20..bbf2b9b8097 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StrLenFunctionNode.java
@@ -9,14 +9,9 @@ package com.yahoo.searchlib.expression;
  */
 public class StrLenFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 130, StrLenFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 130, StrLenFunctionNode.class, StrLenFunctionNode::new);
 
-    /**
-     * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
-     */
-    public StrLenFunctionNode() {
-
-    }
+    public StrLenFunctionNode() {}
 
     /**
      * Constructs an instance of this class with given argument.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNode.java
index dd3a9d79d2f..ccd1364a581 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNode.java
@@ -14,7 +14,7 @@ import com.yahoo.vespa.objects.Serializer;
 public class StringBucketResultNode extends BucketResultNode {
 
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 103, StringBucketResultNode.class);
+    public static final int classId = registerClass(0x4000 + 103, StringBucketResultNode.class, StringBucketResultNode::new);
 
     // bucket start, inclusive
     private ResultNode from = StringResultNode.getNegativeInfinity();
@@ -27,12 +27,7 @@ public class StringBucketResultNode extends BucketResultNode {
         return to.equals(from);
     }
 
-    /**
-     * Constructs an empty result node.
-     */
-    public StringBucketResultNode() {
-        // empty
-    }
+    public StringBucketResultNode() {}
 
     /**
      * Create a bucket with the given limits
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java
index d3c10fec87e..41593998cb4 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringBucketResultNodeVector.java
@@ -15,16 +15,15 @@ import java.util.ArrayList;
 public class StringBucketResultNodeVector extends ResultNodeVector {
 
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 114, StringBucketResultNodeVector.class);
-    private ArrayList<StringBucketResultNode> vector = new ArrayList<StringBucketResultNode>();
+    public static final int classId = registerClass(0x4000 + 114, StringBucketResultNodeVector.class, StringBucketResultNodeVector::new);
+    private ArrayList<StringBucketResultNode> vector = new ArrayList<>();
 
     @Override
     protected int onGetClassId() {
         return classId;
     }
 
-    public StringBucketResultNodeVector() {
-    }
+    public StringBucketResultNodeVector() {}
 
     public StringBucketResultNodeVector add(StringBucketResultNode v) {
         vector.add(v);
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java
index 0c8e099e4de..142982d4f11 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/StringResultNodeVector.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
 public class StringResultNodeVector extends ResultNodeVector {
 
     // The global class identifier shared with C++.
-    public static final int classId = registerClass(0x4000 + 111, StringResultNodeVector.class);
+    public static final int classId = registerClass(0x4000 + 111, StringResultNodeVector.class, StringResultNodeVector::new);
     private ArrayList<StringResultNode> vector = new ArrayList<StringResultNode>();
 
     @Override
@@ -23,8 +23,7 @@ public class StringResultNodeVector extends ResultNodeVector {
         return classId;
     }
 
-    public StringResultNodeVector() {
-    }
+    public StringResultNodeVector() {}
 
     public StringResultNodeVector add(StringResultNode v) {
         vector.add(v);
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/TimeStampFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/TimeStampFunctionNode.java
index cb5e9d1727d..6332a7134c1 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/TimeStampFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/TimeStampFunctionNode.java
@@ -40,14 +40,11 @@ public class TimeStampFunctionNode extends UnaryFunctionNode {
         }
     }
 
-    public static final int classId = registerClass(0x4000 + 75, TimeStampFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 75, TimeStampFunctionNode.class, TimeStampFunctionNode::new);
     private TimePart timePart = TimePart.Year;
     private boolean isGmt = false;
 
-    @SuppressWarnings("UnusedDeclaration")
-    public TimeStampFunctionNode() {
-        // used by deserializer
-    }
+    public TimeStampFunctionNode() {}
 
     /**
      * <p>Create a bucket expression with the given width and the given subexpression.</p>
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java
index 8553331d178..bd8941540bc 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToFloatFunctionNode.java
@@ -9,14 +9,9 @@ package com.yahoo.searchlib.expression;
  */
 public class ToFloatFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 134, ToFloatFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 134, ToFloatFunctionNode.class, ToFloatFunctionNode::new);
 
-    /**
-     * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
-     */
-    public ToFloatFunctionNode() {
-
-    }
+    public ToFloatFunctionNode() {}
 
     /**
      * Constructs an instance of this class with given argument.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java
index 66b3f07cd1a..a5bf319dcda 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToIntFunctionNode.java
@@ -9,14 +9,9 @@ package com.yahoo.searchlib.expression;
  */
 public class ToIntFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 135, ToIntFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 135, ToIntFunctionNode.class, ToIntFunctionNode::new);
 
-    /**
-     * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
-     */
-    public ToIntFunctionNode() {
-
-    }
+    public ToIntFunctionNode() {}
 
     /**
      * Constructs an instance of this class with given argument.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToRawFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToRawFunctionNode.java
index 9841ae04498..15480ce719c 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToRawFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToRawFunctionNode.java
@@ -8,14 +8,9 @@ package com.yahoo.searchlib.expression;
  */
 public class ToRawFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 141, ToRawFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 141, ToRawFunctionNode.class, ToRawFunctionNode::new);
 
-    /**
-     * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
-     */
-    public ToRawFunctionNode() {
-
-    }
+    public ToRawFunctionNode() {}
 
     /**
      * Constructs an instance of this class with given argument.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java
index e42da3b6bb0..4cfc54e4341 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ToStringFunctionNode.java
@@ -9,14 +9,9 @@ package com.yahoo.searchlib.expression;
  */
 public class ToStringFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 131, ToStringFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 131, ToStringFunctionNode.class, ToStringFunctionNode::new);
 
-    /**
-     * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
-     */
-    public ToStringFunctionNode() {
-
-    }
+    public ToStringFunctionNode() {}
 
     /**
      * Constructs an instance of this class with given argument.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java
index 4b7a589d836..df1e54b66ef 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/UcaFunctionNode.java
@@ -12,16 +12,11 @@ import com.yahoo.vespa.objects.Serializer;
  */
 public class UcaFunctionNode extends UnaryFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 140, UcaFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 140, UcaFunctionNode.class, UcaFunctionNode::new);
     private String locale = "en-US";
     private String strength = "TERTIARY";
 
-    /**
-     * Constructs an empty result node.
-     */
-    public UcaFunctionNode() {
-        // empty
-    }
+    public UcaFunctionNode() {}
 
     /**
      * Create an UCA node with a specific locale.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java
index 157a0471eeb..1def3586471 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/UnaryBitFunctionNode.java
@@ -19,9 +19,7 @@ public abstract class UnaryBitFunctionNode extends UnaryFunctionNode {
     /**
      * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
      */
-    public UnaryBitFunctionNode() {
-
-    }
+    public UnaryBitFunctionNode() {}
 
     /**
      * Constructs an instance of this class with given argument and number of bits.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java
index 313bf59b2d4..dba95e4150d 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorBitFunctionNode.java
@@ -12,14 +12,9 @@ package com.yahoo.searchlib.expression;
  */
 public class XorBitFunctionNode extends UnaryBitFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 71, XorBitFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 71, XorBitFunctionNode.class, XorBitFunctionNode::new);
 
-    /**
-     * Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set.
-     */
-    public XorBitFunctionNode() {
-
-    }
+    public XorBitFunctionNode() {}
 
     /**
      * Constructs an instance of this class with given argument and number of bits.
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java
index 34e10ddcc91..2cab47f8ed6 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/XorFunctionNode.java
@@ -9,7 +9,7 @@ package com.yahoo.searchlib.expression;
  */
 public class XorFunctionNode extends BitFunctionNode {
 
-    public static final int classId = registerClass(0x4000 + 69, XorFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 69, XorFunctionNode.class, XorFunctionNode::new);
 
     @Override
     protected int onGetClassId() {
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java
index bac3ef73c66..a068c4ed189 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ZCurveFunctionNode.java
@@ -32,13 +32,10 @@ public class ZCurveFunctionNode extends UnaryFunctionNode {
         }
     }
 
-    public static final int classId = registerClass(0x4000 + 139, ZCurveFunctionNode.class);
+    public static final int classId = registerClass(0x4000 + 139, ZCurveFunctionNode.class, ZCurveFunctionNode::new);
     private Dimension dim = Dimension.X;
 
-    @SuppressWarnings("UnusedDeclaration")
-    public ZCurveFunctionNode() {
-        // used by deserializer
-    }
+    private ZCurveFunctionNode() {}
 
     public ZCurveFunctionNode(ExpressionNode arg, Dimension dimension) {
         addArg(arg);