Remove default constructors from inserters

7 files changed, 22 insertions, 27 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java b/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java
index 4ea9239798a..f0928aee8ca 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java
@@ -8,7 +8,6 @@ package com.yahoo.slime;
 public final class ArrayInserter implements Inserter {
     private Cursor target;
 
-    public ArrayInserter() {}
     public ArrayInserter(Cursor c) { adjust(c); }
 
     public final ArrayInserter adjust(Cursor c) {
diff --git a/vespajlib/src/main/java/com/yahoo/slime/BinaryDecoder.java b/vespajlib/src/main/java/com/yahoo/slime/BinaryDecoder.java
index 2281890bbeb..ecee5e9504e 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/BinaryDecoder.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/BinaryDecoder.java
@@ -6,9 +6,9 @@ import static com.yahoo.slime.BinaryFormat.*;
 final class BinaryDecoder {
     BufferedInput in;
 
-    private final SlimeInserter slimeInserter = new SlimeInserter();
-    private final ArrayInserter arrayInserter = new ArrayInserter();
-    private final ObjectSymbolInserter objectInserter = new ObjectSymbolInserter();
+    private final SlimeInserter slimeInserter = new SlimeInserter(null);
+    private final ArrayInserter arrayInserter = new ArrayInserter(null);
+    private final ObjectSymbolInserter objectInserter = new ObjectSymbolInserter(null, 0);
 
     public BinaryDecoder() {}
 
diff --git a/vespajlib/src/main/java/com/yahoo/slime/JsonDecoder.java b/vespajlib/src/main/java/com/yahoo/slime/JsonDecoder.java
index 15bd8948861..a761c91f64f 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/JsonDecoder.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/JsonDecoder.java
@@ -15,9 +15,9 @@ public class JsonDecoder {
     private BufferedInput in;
     private byte c;
 
-    private final SlimeInserter slimeInserter = new SlimeInserter();
-    private final ArrayInserter arrayInserter = new ArrayInserter();
-    private final ObjectInserter objectInserter = new ObjectInserter();
+    private final SlimeInserter slimeInserter = new SlimeInserter(null);
+    private final ArrayInserter arrayInserter = new ArrayInserter(null);
+    private final ObjectInserter objectInserter = new ObjectInserter(null, null);
     private final ByteArrayOutputStream buf = new ByteArrayOutputStream();
 
     private static final byte[] TRUE = {'t', 'r', 'u', 'e'};
diff --git a/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java b/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java
index 96b7a4e4a15..4e573770565 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java
@@ -8,8 +8,6 @@ public final class ObjectInserter implements Inserter {
     private Cursor target;
     private String key;
 
-    public ObjectInserter() {}
-
     public ObjectInserter(Cursor c, String key) {
         adjust(c, key);
     }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolInserter.java b/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolInserter.java
index 9f50e1ae7df..834de624726 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolInserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolInserter.java
@@ -9,8 +9,6 @@ public final class ObjectSymbolInserter implements Inserter {
     private Cursor target;
     private int symbol;
 
-    public ObjectSymbolInserter() {}
-
     public ObjectSymbolInserter(Cursor cursor, int sym) {
         adjust(cursor, sym);
     }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/SlimeInserter.java b/vespajlib/src/main/java/com/yahoo/slime/SlimeInserter.java
index 62b7cb06b6d..a20ad5ce993 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/SlimeInserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/SlimeInserter.java
@@ -7,10 +7,16 @@ package com.yahoo.slime;
  **/
 public final class SlimeInserter implements Inserter {
     private Slime target;
+
+    public SlimeInserter(Slime target) {
+        adjust(target);
+    }
+
     public final SlimeInserter adjust(Slime slime) {
         target = slime;
         return this;
     }
+
     public final Cursor insertNIX()                { return target.setNix(); }
     public final Cursor insertBOOL(boolean value)  { return target.setBool(value); }
     public final Cursor insertLONG(long value)     { return target.setLong(value); }
diff --git a/vespajlib/src/test/java/com/yahoo/slime/InjectorTest.java b/vespajlib/src/test/java/com/yahoo/slime/InjectorTest.java
index c1e7fd4eece..a11d3ad220f 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/InjectorTest.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/InjectorTest.java
@@ -62,12 +62,6 @@ public class InjectorTest {
         injector.inject(inspector, inserter);
     }
 
-    private Inserter slimeInserter(Slime slime) {
-        var inserter = new SlimeInserter();
-        inserter.adjust(slime);
-        return inserter;
-    }
-
     private void assertEqualTo(Slime left, Slime right) {
         assertTrue("'" + left + "' not equal to '" + right + "'", left.equalTo(right));
     }
@@ -80,15 +74,15 @@ public class InjectorTest {
     public void injectIntoSlime() {
         assertTrue(f1.empty.get().valid()); // explicit nix
 
-        inject(f1.empty.get(), slimeInserter(f2.slime1));
-        inject(f1.nixValue.get(), slimeInserter(f2.slime2));
-        inject(f1.boolValue.get(), slimeInserter(f2.slime3));
-        inject(f1.longValue.get(), slimeInserter(f2.slime4));
-        inject(f1.doubleValue.get(), slimeInserter(f2.slime5));
-        inject(f1.stringValue.get(), slimeInserter(f2.slime6));
-        inject(f1.dataValue.get(), slimeInserter(f2.slime7));
-        inject(f1.arrayValue.get(), slimeInserter(f2.slime8));
-        inject(f1.objectValue.get(), slimeInserter(f2.slime9));
+        inject(f1.empty.get(), new SlimeInserter(f2.slime1));
+        inject(f1.nixValue.get(), new SlimeInserter(f2.slime2));
+        inject(f1.boolValue.get(), new SlimeInserter(f2.slime3));
+        inject(f1.longValue.get(), new SlimeInserter(f2.slime4));
+        inject(f1.doubleValue.get(), new SlimeInserter(f2.slime5));
+        inject(f1.stringValue.get(), new SlimeInserter(f2.slime6));
+        inject(f1.dataValue.get(), new SlimeInserter(f2.slime7));
+        inject(f1.arrayValue.get(), new SlimeInserter(f2.slime8));
+        inject(f1.objectValue.get(), new SlimeInserter(f2.slime9));
 
         assertEquals(f1.empty.get().toString(), f2.slime1.get().toString());
         assertEquals(f1.nixValue.get().toString(), f2.slime2.get().toString());
@@ -152,7 +146,7 @@ public class InjectorTest {
 
     @Test
     public void invalidInjectionIsIgnored() {
-        inject(f1.arrayValue.get(), slimeInserter(f2.slime1));
+        inject(f1.arrayValue.get(), new SlimeInserter(f2.slime1));
         assertEquals(3, f2.slime1.get().entries());
         inject(f1.longValue.get(), new ArrayInserter(f2.slime1.get()));
         assertEquals(4, f2.slime1.get().entries());