Add nix equality test and more

6 files changed, 14 insertions, 16 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java b/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java
index f0928aee8ca..84e42d83de8 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java
@@ -8,7 +8,7 @@ package com.yahoo.slime;
 public final class ArrayInserter implements Inserter {
     private Cursor target;
 
-    public ArrayInserter(Cursor c) { adjust(c); }
+    public ArrayInserter(Cursor c) { target = c; }
 
     public final ArrayInserter adjust(Cursor c) {
         target = c;
diff --git a/vespajlib/src/main/java/com/yahoo/slime/Injector.java b/vespajlib/src/main/java/com/yahoo/slime/Injector.java
index 95198c16031..f21cf621d3c 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/Injector.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/Injector.java
@@ -50,18 +50,6 @@ public class Injector {
         });
     }
 
-    private void injectArray(Inserter inserter, Inspector inspector, Inspector guard) {
-        Cursor cursor = inserter.insertARRAY();
-        ArrayTraverser arrayTraverser = new NestedInjector(cursor, guard != null ? guard : cursor);
-        inspector.traverse(arrayTraverser);
-    }
-
-    private void injectObject(Inserter inserter, Inspector inspector, Inspector guard) {
-        Cursor cursor = inserter.insertOBJECT();
-        ObjectTraverser objectTraverser = new NestedInjector(cursor, guard != null ? guard : cursor);
-        inspector.traverse(objectTraverser);
-    }
-
     private class NestedInjector implements ArrayTraverser, ObjectTraverser {
         private final Cursor cursor;
         private final Inspector guard;
diff --git a/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java b/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java
index 4e573770565..3da39fd753a 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java
@@ -9,7 +9,8 @@ public final class ObjectInserter implements Inserter {
     private String key;
 
     public ObjectInserter(Cursor c, String key) {
-        adjust(c, key);
+        target = c;
+        this.key = key;
     }
 
     public final ObjectInserter adjust(Cursor c, String key) {
diff --git a/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolInserter.java b/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolInserter.java
index 834de624726..0fa66245643 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolInserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolInserter.java
@@ -10,7 +10,8 @@ public final class ObjectSymbolInserter implements Inserter {
     private int symbol;
 
     public ObjectSymbolInserter(Cursor cursor, int sym) {
-        adjust(cursor, sym);
+        target = cursor;
+        symbol = sym;
     }
 
     public final ObjectSymbolInserter adjust(Cursor c, int sym) {
diff --git a/vespajlib/src/main/java/com/yahoo/slime/SlimeInserter.java b/vespajlib/src/main/java/com/yahoo/slime/SlimeInserter.java
index a20ad5ce993..2b048c42f73 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/SlimeInserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/SlimeInserter.java
@@ -9,7 +9,7 @@ public final class SlimeInserter implements Inserter {
     private Slime target;
 
     public SlimeInserter(Slime target) {
-        adjust(target);
+        this.target = target;
     }
 
     public final SlimeInserter adjust(Slime slime) {
diff --git a/vespajlib/src/test/java/com/yahoo/slime/ValueTest.java b/vespajlib/src/test/java/com/yahoo/slime/ValueTest.java
index a0e3c8029ca..50d2e900720 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/ValueTest.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/ValueTest.java
@@ -104,6 +104,14 @@ public class ValueTest {
         assertNotEqualTo(left.get(), right.get());
     }
 
+    @Test
+    public void testNixEquality() {
+        assertEqualTo(NixValue.invalid(), NixValue.invalid());
+        assertEqualTo(NixValue.instance(), NixValue.instance());
+        assertNotEqualTo(NixValue.instance(), NixValue.invalid());
+        assertNotEqualTo(NixValue.invalid(), NixValue.instance());
+    }
+
     private void populateWithPrimitives(Cursor cursor, boolean enabled) {
         cursor.setBool("bool", enabled ? true : false);
         cursor.setNix("nix");