Cleanup and simplify slightly

9 files changed, 41 insertions, 30 deletions

diff --git a/container-search/src/main/java/com/yahoo/data/XmlProducer.java b/container-search/src/main/java/com/yahoo/data/XmlProducer.java
index cdbfa61d2c2..21610fb7b50 100644
--- a/container-search/src/main/java/com/yahoo/data/XmlProducer.java
+++ b/container-search/src/main/java/com/yahoo/data/XmlProducer.java
@@ -8,6 +8,7 @@ public interface XmlProducer {
 
     /**
      * Append the XML representation of this object's data to a StringBuilder.
+     *
      * @param target the StringBuilder to append to.
      * @return the target passed in is also returned (to allow chaining).
      */
@@ -16,6 +17,7 @@ public interface XmlProducer {
     /**
      * Convenience method equivalent to:
      * writeXML(new StringBuilder()).toString()
+     *
      * @return String containing XML representation of this object's data.
      */
     default String toXML() {
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinition.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinition.java
index 20615a099b6..fe7e7c87927 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinition.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumDefinition.java
@@ -79,7 +79,7 @@ public class DocsumDefinition {
      */
     public Object convert(String fieldName, Inspector value) {
         DocsumField fieldType = getField(fieldName);
-        if (fieldType == null) return null;
+        if (fieldType == null || ! value.valid()) return null;
         return fieldType.convert(value);
     }
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
index 8d73f6795d4..5433d37c66e 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
@@ -505,12 +505,7 @@ public class FastHit extends Hit {
         }
 
         Object getField(String name) {
-            // TODO: When emulConfig is removed, change the below to use type.convert(name, data.field(name))
-            DocsumField fieldType = type.getField(name);
-            if (fieldType == null) return null;
-            Inspector fieldValue = data.field(name);
-            if ( ! fieldValue.valid()) return null;
-            return fieldType.convert(fieldValue);
+            return type.convert(name, data.field(name));
         }
 
         void forEachField(BiConsumer<String, Object> consumer) {
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/BoldCloseFieldPart.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/BoldCloseFieldPart.java
index 7d3dacae299..54d8de61d1e 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/BoldCloseFieldPart.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/BoldCloseFieldPart.java
@@ -5,10 +5,12 @@ package com.yahoo.prelude.hitfield;
  * Represents an element of a hit property which is markup, representing
  * end of a bolded area.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class BoldCloseFieldPart extends MarkupFieldPart {
+
     public BoldCloseFieldPart(String content) {
         super(content);
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/BoldOpenFieldPart.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/BoldOpenFieldPart.java
index ec1a742acdb..8da9529f3c6 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/BoldOpenFieldPart.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/BoldOpenFieldPart.java
@@ -5,10 +5,12 @@ package com.yahoo.prelude.hitfield;
  * Represents an element of a hit property which is markup representing
  * the start of a bolded area.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class BoldOpenFieldPart extends MarkupFieldPart {
+
     public BoldOpenFieldPart(String content) {
         super(content);
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java
index 2702da099be..fd8648b758a 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/HitField.java
@@ -295,26 +295,20 @@ public class HitField {
 
     /** Returns the content of this field, using the arguments as bolding tags */
     public String getContent(String boldOpenTag, String boldCloseTag, String separatorTag) {
-        StringBuilder buf = new StringBuilder();
+        StringBuilder b = new StringBuilder();
         Iterator<FieldPart> iter = ensureTokenized().iterator();
         while(iter.hasNext()) {
             FieldPart f = iter.next();
-            if (f instanceof BoldOpenFieldPart
-                && boldOpenTag != null
-                && boldOpenTag.length() > 0)
-                buf.append(boldOpenTag);
-            else if (f instanceof BoldCloseFieldPart
-                     && boldCloseTag != null
-                     && boldCloseTag.length() > 0)
-                buf.append(boldCloseTag);
-            else if (f instanceof SeparatorFieldPart
-                     && separatorTag != null
-                     && separatorTag.length() > 0)
-                buf.append(separatorTag);
+            if (f instanceof BoldOpenFieldPart && boldOpenTag != null && boldOpenTag.length() > 0)
+                b.append(boldOpenTag);
+            else if (f instanceof BoldCloseFieldPart && boldCloseTag != null && boldCloseTag.length() > 0)
+                b.append(boldCloseTag);
+            else if (f instanceof SeparatorFieldPart && separatorTag != null && separatorTag.length() > 0)
+                b.append(separatorTag);
             else
-                buf.append(f.getContent());
+                b.append(f.getContent());
         }
-        return buf.toString();
+        return b.toString();
     }
 
     public void markDirty() {
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java
index eee7b310d13..209bfd08e6b 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
  */
 public class JSONString implements Inspectable {
 
-    private static final long serialVersionUID = -3929383619752472712L;
     private Inspector value;
     private String content;
     private boolean didInitContent = false;
@@ -270,6 +269,7 @@ public class JSONString implements Inspectable {
     }
 
     private static class StructureFieldRenderer extends FieldRenderer {
+
         @Override
         public void render(StringBuilder renderTarget, Object value, int nestingLevel) {
             renderStructure(renderTarget, (JSONObject) value, nestingLevel);
@@ -294,9 +294,11 @@ public class JSONString implements Inspectable {
             indent(renderTarget, nestingLevel);
             renderTarget.append(closing);
         }
+
     }
 
     private static class NumberFieldRenderer extends FieldRenderer {
+
         @Override
         public void render(StringBuilder renderTarget, Object value, int nestingLevel) {
             renderNumber(renderTarget, (Number) value);
@@ -310,9 +312,11 @@ public class JSONString implements Inspectable {
         public void closeTag(StringBuilder renderTarget, int nestingLevel, String closing) {
             renderTarget.append(closing);
         }
+
     }
 
     private static class StringFieldRenderer extends FieldRenderer {
+
         @Override
         public void render(StringBuilder renderTarget, Object value, int nestingLevel) {
             renderString(renderTarget, (String) value);
@@ -326,9 +330,11 @@ public class JSONString implements Inspectable {
         public void closeTag(StringBuilder renderTarget, int nestingLevel, String closing) {
             renderTarget.append(closing);
         }
+
     }
 
     private static class ArrayFieldRenderer extends FieldRenderer {
+
         protected static FieldRenderer structureFieldRenderer = new StructureFieldRenderer();
         protected static FieldRenderer stringFieldRenderer = new StringFieldRenderer();
         protected static FieldRenderer numberFieldRenderer = new NumberFieldRenderer();
@@ -400,14 +406,13 @@ public class JSONString implements Inspectable {
             }
             renderTarget.append('\n');
             for (int i = 0; i < limit; ++i) {
-                JSONArray value;
                 Object name;
                 Number weight;
 
                 try {
-                    value = seq.getJSONArray(i);
-                    name = value.get(0);
-                    weight = (Number) value.get(1);
+                    JSONArray arrayValue = seq.getJSONArray(i);
+                    name = arrayValue.get(0);
+                    weight = (Number)arrayValue.get(1);
 
                 } catch (JSONException e) {
                     continue;
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/SeparatorFieldPart.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/SeparatorFieldPart.java
index 76fdbe61d84..a37d208f1ad 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/SeparatorFieldPart.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/SeparatorFieldPart.java
@@ -5,10 +5,12 @@ package com.yahoo.prelude.hitfield;
  * Represents an element of a hit property which is markup for
  * separating dynamic snippets.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class SeparatorFieldPart extends MarkupFieldPart {
+
     public SeparatorFieldPart(String content) {
         super(content);
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/TokenFieldIterator.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/TokenFieldIterator.java
index beda005152c..443a9bb725b 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/TokenFieldIterator.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/TokenFieldIterator.java
@@ -22,12 +22,14 @@ public class TokenFieldIterator implements ListIterator<FieldPart> {
         this.hitField = hitField;
     }
 
+    @Override
     public void add(FieldPart o) {
         fieldList.add(index, o);
         index++;
         hitField.markDirty();
     }
 
+    @Override
     public boolean hasNext() {
         int i = index;
         while (i < fieldList.size()) {
@@ -38,6 +40,7 @@ public class TokenFieldIterator implements ListIterator<FieldPart> {
         return false;
     }
 
+    @Override
     public boolean hasPrevious() {
         int i = index;
         while (i > 0) {
@@ -48,6 +51,7 @@ public class TokenFieldIterator implements ListIterator<FieldPart> {
         return false;
     }
 
+    @Override
     public FieldPart next() {
         int i = index;
         while (i < fieldList.size()) {
@@ -61,6 +65,7 @@ public class TokenFieldIterator implements ListIterator<FieldPart> {
         throw new NoSuchElementException("No more tokens available.");
     }
 
+    @Override
     public int nextIndex() {
         int i = index;
         while (i < fieldList.size()) {
@@ -71,6 +76,7 @@ public class TokenFieldIterator implements ListIterator<FieldPart> {
         return fieldList.size();
     }
 
+    @Override
     public FieldPart previous() {
         int i = index;
         while (i > 0) {
@@ -84,6 +90,7 @@ public class TokenFieldIterator implements ListIterator<FieldPart> {
         throw new NoSuchElementException("Trying to go before first token available.");
     }
 
+    @Override
     public int previousIndex() {
         int i = index;
         while (i > 0) {
@@ -94,6 +101,7 @@ public class TokenFieldIterator implements ListIterator<FieldPart> {
         return -1;
     }
 
+    @Override
     public void remove() {
         fieldList.remove(prevReturned);
         if (prevReturned < index)
@@ -101,6 +109,7 @@ public class TokenFieldIterator implements ListIterator<FieldPart> {
         hitField.markDirty();
     }
 
+    @Override
     public void set(FieldPart o) {
         fieldList.set(prevReturned, o);
         hitField.markDirty();