Cleanup; No functional changes

17 files changed, 71 insertions, 50 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java b/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java
index 993556922d0..e2bb7479574 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/ArrayInserter.java
@@ -4,24 +4,26 @@ package com.yahoo.slime;
 /**
  * Helper class for inserting values into an ArrayValue.
  * For justification read Inserter documentation.
- **/
+ */
 public final class ArrayInserter implements Inserter {
+
     private Cursor target;
 
     public ArrayInserter(Cursor c) { target = c; }
 
-    public final ArrayInserter adjust(Cursor c) {
+    public ArrayInserter adjust(Cursor c) {
         target = c;
         return this;
     }
 
-    public final Cursor insertNIX()                { return target.addNix(); }
-    public final Cursor insertBOOL(boolean value)  { return target.addBool(value); }
-    public final Cursor insertLONG(long value)     { return target.addLong(value); }
-    public final Cursor insertDOUBLE(double value) { return target.addDouble(value); }
-    public final Cursor insertSTRING(String value) { return target.addString(value); }
-    public final Cursor insertSTRING(byte[] utf8)  { return target.addString(utf8); }
-    public final Cursor insertDATA(byte[] value)   { return target.addData(value); }
-    public final Cursor insertARRAY()              { return target.addArray(); }
-    public final Cursor insertOBJECT()             { return target.addObject(); }
+    public Cursor insertNIX()                { return target.addNix(); }
+    public Cursor insertBOOL(boolean value)  { return target.addBool(value); }
+    public Cursor insertLONG(long value)     { return target.addLong(value); }
+    public Cursor insertDOUBLE(double value) { return target.addDouble(value); }
+    public Cursor insertSTRING(String value) { return target.addString(value); }
+    public Cursor insertSTRING(byte[] utf8)  { return target.addString(utf8); }
+    public Cursor insertDATA(byte[] value)   { return target.addData(value); }
+    public Cursor insertARRAY()              { return target.addArray(); }
+    public Cursor insertOBJECT()             { return target.addObject(); }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/BinaryDecoder.java b/vespajlib/src/main/java/com/yahoo/slime/BinaryDecoder.java
index 383fd626a62..b9aa8e5cf22 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/BinaryDecoder.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/BinaryDecoder.java
@@ -8,6 +8,7 @@ import static com.yahoo.slime.BinaryFormat.decode_type;
 import static com.yahoo.slime.BinaryFormat.decode_zigzag;
 
 final class BinaryDecoder {
+
     BufferedInput in;
 
     private final SlimeInserter slimeInserter = new SlimeInserter(null);
@@ -160,4 +161,5 @@ final class BinaryDecoder {
             }
         }
     }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/BinaryEncoder.java b/vespajlib/src/main/java/com/yahoo/slime/BinaryEncoder.java
index 0d848e83bab..7da85b5cb63 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/BinaryEncoder.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/BinaryEncoder.java
@@ -5,9 +5,8 @@ import static com.yahoo.slime.BinaryFormat.encode_double;
 import static com.yahoo.slime.BinaryFormat.encode_type_and_meta;
 import static com.yahoo.slime.BinaryFormat.encode_zigzag;
 
-final class BinaryEncoder implements
-ArrayTraverser, ObjectSymbolTraverser
-{
+final class BinaryEncoder implements ArrayTraverser, ObjectSymbolTraverser {
+
     private final BufferedOutput out;
 
     BinaryEncoder() {
@@ -143,4 +142,5 @@ ArrayTraverser, ObjectSymbolTraverser
         encode_cmpr_long(symbol);
         encodeValue(inspector);
     }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/BinaryFormat.java b/vespajlib/src/main/java/com/yahoo/slime/BinaryFormat.java
index b397d4c2982..519ab54e25d 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/BinaryFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/BinaryFormat.java
@@ -6,8 +6,9 @@ import com.yahoo.compress.Compressor;
 /**
  * Class for serializing Slime data into binary format, or deserializing
  * the binary format into a Slime object.
- **/
+ */
 public class BinaryFormat {
+
     static long encode_zigzag(long x) {
         return ((x << 1) ^ (x >> 63)); // note ASR
     }
@@ -96,4 +97,5 @@ public class BinaryFormat {
         BinaryDecoder decoder = new BinaryDecoder();
         return decoder.decode(data, offset, length);
     }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/Injector.java b/vespajlib/src/main/java/com/yahoo/slime/Injector.java
index eec5f3999f9..71b5574fcc8 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/Injector.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/Injector.java
@@ -5,6 +5,7 @@ package com.yahoo.slime;
  * @author hakonhall
  */
 public class Injector {
+
     /**
      * Inject a slime sub-structure described by an Inspector into a slime
      * structure where the insertion point is described by an
@@ -17,7 +18,7 @@ public class Injector {
      *
      * @param inspector what to inject
      * @param inserter where to inject
-     **/
+     */
     public void inject(Inspector inspector, Inserter inserter) {
         if (inspector.valid()) {
             injectValue(inserter, inspector, null);
@@ -77,4 +78,5 @@ public class Injector {
             injectValue(new ObjectInserter(cursor, name), inspector, guard);
         }
     }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/Inserter.java b/vespajlib/src/main/java/com/yahoo/slime/Inserter.java
index 7a7e5ba6f84..c36b56c11e2 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/Inserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/Inserter.java
@@ -6,8 +6,9 @@ package com.yahoo.slime;
  * classes (ArrayValue, ObjectValue, or Slime).  May be useful for
  * deserializers where you can use it to decouple the actual value
  * decoding from the container where the value should be inserted.
- **/
+ */
 public interface Inserter {
+
     Cursor insertNIX();
     Cursor insertBOOL(boolean value);
     Cursor insertLONG(long value);
@@ -17,4 +18,5 @@ public interface Inserter {
     Cursor insertDATA(byte[] value);
     Cursor insertARRAY();
     Cursor insertOBJECT();
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
index e7a96695922..3772aafa044 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/JsonFormat.java
@@ -14,8 +14,8 @@ import java.io.*;
  *
  * @author Ulf Lilleengen
  */
-public final class JsonFormat implements SlimeFormat
-{
+public final class JsonFormat implements SlimeFormat {
+
     private final static byte [] HEX = Utf8.toBytes("0123456789ABCDEF");
     private final boolean compact;
     public JsonFormat(boolean compact) {
diff --git a/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java b/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java
index c6becab554e..57c99f4604e 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/ObjectInserter.java
@@ -5,6 +5,7 @@ package com.yahoo.slime;
  * @author hakonhall
  */
 public final class ObjectInserter implements Inserter {
+
     private Cursor target;
     private 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 c5c18943926..4935d96d388 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolInserter.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolInserter.java
@@ -4,8 +4,9 @@ package com.yahoo.slime;
 /**
  * Helper class for inserting values into an ObjectValue.
  * For justification read Inserter documentation.
- **/
+ */
 public final class ObjectSymbolInserter implements Inserter {
+
     private Cursor target;
     private int symbol;
 
@@ -14,19 +15,19 @@ public final class ObjectSymbolInserter implements Inserter {
         symbol = sym;
     }
 
-    public final ObjectSymbolInserter adjust(Cursor c, int sym) {
+    public ObjectSymbolInserter adjust(Cursor c, int sym) {
         target = c;
         symbol = sym;
         return this;
     }
 
-    public final Cursor insertNIX()                { return target.setNix(symbol); }
-    public final Cursor insertBOOL(boolean value)  { return target.setBool(symbol, value); }
-    public final Cursor insertLONG(long value)     { return target.setLong(symbol, value); }
-    public final Cursor insertDOUBLE(double value) { return target.setDouble(symbol, value); }
-    public final Cursor insertSTRING(String value) { return target.setString(symbol, value); }
-    public final Cursor insertSTRING(byte[] utf8)  { return target.setString(symbol, utf8); }
-    public final Cursor insertDATA(byte[] value)   { return target.setData(symbol, value); }
-    public final Cursor insertARRAY()              { return target.setArray(symbol); }
-    public final Cursor insertOBJECT()             { return target.setObject(symbol); }
+    public Cursor insertNIX()                { return target.setNix(symbol); }
+    public Cursor insertBOOL(boolean value)  { return target.setBool(symbol, value); }
+    public Cursor insertLONG(long value)     { return target.setLong(symbol, value); }
+    public Cursor insertDOUBLE(double value) { return target.setDouble(symbol, value); }
+    public Cursor insertSTRING(String value) { return target.setString(symbol, value); }
+    public Cursor insertSTRING(byte[] utf8)  { return target.setString(symbol, utf8); }
+    public Cursor insertDATA(byte[] value)   { return target.setData(symbol, value); }
+    public Cursor insertARRAY()              { return target.setArray(symbol); }
+    public Cursor insertOBJECT()             { return target.setObject(symbol); }
 }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolTraverser.java b/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolTraverser.java
index 90ca9bc70cd..a4946d3ff31 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolTraverser.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/ObjectSymbolTraverser.java
@@ -6,12 +6,14 @@ package com.yahoo.slime;
  * Implement this and call Inspector.traverse()
  * and you will get one callback for each field in an object.
  **/
-public interface ObjectSymbolTraverser
-{
+public interface ObjectSymbolTraverser {
+
     /**
      * Callback function to implement.
+     *
      * @param sym symbol id for the current field.
      * @param inspector accessor for the current field's value.
-     **/
-    public void field(int sym, Inspector inspector);
+     */
+    void field(int sym, Inspector inspector);
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/ObjectTraverser.java b/vespajlib/src/main/java/com/yahoo/slime/ObjectTraverser.java
index 6597d3b82f3..d9f9b75dfd1 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/ObjectTraverser.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/ObjectTraverser.java
@@ -7,6 +7,7 @@ package com.yahoo.slime;
  * and you will get one callback for each field in an object.
  */
 public interface ObjectTraverser {
+
     /**
      * Callback function to implement.
      *
diff --git a/vespajlib/src/main/java/com/yahoo/slime/Slime.java b/vespajlib/src/main/java/com/yahoo/slime/Slime.java
index c45b48cf743..eba9226c8ef 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/Slime.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/Slime.java
@@ -7,7 +7,7 @@ package com.yahoo.slime;
  * ObjectValue data objects).
  * 
  * @author havardpe
- **/
+ */
 public final class Slime {
 
     private final SymbolTable names = new SymbolTable();
diff --git a/vespajlib/src/main/java/com/yahoo/slime/SlimeStream.java b/vespajlib/src/main/java/com/yahoo/slime/SlimeStream.java
index 4fea24110f0..0c0229579e7 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/SlimeStream.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/SlimeStream.java
@@ -11,6 +11,7 @@ import java.util.stream.Stream;
  * @author ogronnesby
  */
 public final class SlimeStream {
+
     private SlimeStream() {}
 
     /**
@@ -24,4 +25,5 @@ public final class SlimeStream {
                 .mapToObj(array::entry)
                 .map(mapper);
     }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/SymbolTable.java b/vespajlib/src/main/java/com/yahoo/slime/SymbolTable.java
index 0e498aa72e7..e86835fc0b7 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/SymbolTable.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/SymbolTable.java
@@ -5,7 +5,7 @@ package com.yahoo.slime;
  * A mapping from an arbitrary set of unique strings to a range of
  * integers.  Slime users normally won't need to use this class
  * directly.
- **/
+ */
 final class SymbolTable {
 
     public static final int INVALID = Integer.MAX_VALUE;
@@ -95,4 +95,5 @@ final class SymbolTable {
         }
         return INVALID;
     }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/Type.java b/vespajlib/src/main/java/com/yahoo/slime/Type.java
index 7d2b309157e..5407b296b38 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/Type.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/Type.java
@@ -3,7 +3,7 @@ package com.yahoo.slime;
 
 /**
  * Enumeration of all possibly Slime data types.
- **/
+ */
 public enum Type {
 
     NIX(0),
diff --git a/vespajlib/src/main/java/com/yahoo/slime/Utf8Codec.java b/vespajlib/src/main/java/com/yahoo/slime/Utf8Codec.java
index 73be9620c22..e9f11a90af2 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/Utf8Codec.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/Utf8Codec.java
@@ -5,12 +5,14 @@ import com.yahoo.text.Utf8;
 
 /**
  * Helper class for conversion between String and UTF-8 representations.
- **/
+ */
 class Utf8Codec {
+
     public static String decode(byte[] data, int pos, int len) {
         return Utf8.toString(data, pos, len);
     }
     public static byte[] encode(String str) {
         return Utf8.toBytes(str);
     }
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/slime/Visitor.java b/vespajlib/src/main/java/com/yahoo/slime/Visitor.java
index 5372e9cbf6f..0e49d0daf1e 100644
--- a/vespajlib/src/main/java/com/yahoo/slime/Visitor.java
+++ b/vespajlib/src/main/java/com/yahoo/slime/Visitor.java
@@ -4,19 +4,20 @@ package com.yahoo.slime;
 /**
  * Visitor interface used to resolve the underlying type of a value
  * represented by an Inspector.
- **/
+ */
 public interface Visitor {
+
     /**
      * Called when the visited Inspector is not valid.
-     **/
-    public void visitInvalid();
-    public void visitNix();
-    public void visitBool(boolean bit);
-    public void visitLong(long l);
-    public void visitDouble(double d);
-    public void visitString(String str);
-    public void visitString(byte[] utf8);
-    public void visitData(byte[] data);
-    public void visitArray(Inspector arr);
-    public void visitObject(Inspector obj);
+     */
+    void visitInvalid();
+    void visitNix();
+    void visitBool(boolean bit);
+    void visitLong(long l);
+    void visitDouble(double d);
+    void visitString(String str);
+    void visitString(byte[] utf8);
+    void visitData(byte[] data);
+    void visitArray(Inspector arr);
+    void visitObject(Inspector obj);
 }