Merge pull request #5583 from vespa-engine/revert-5568-revert-5541-revert-5536-bratseth/dispatch-summaries-by-default

Revert "Revert "Revert "dispatch.summaries by default when possible"""

8 files changed, 29 insertions, 55 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/FieldPart.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/FieldPart.java
index 6ca5feb610f..df8f6e92d57 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/FieldPart.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/FieldPart.java
@@ -4,13 +4,11 @@ package com.yahoo.prelude.hitfield;
 /**
  * Represents an element of a hit property
  *
- * @author Steinar Knutsen
+ * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  */
 public interface FieldPart {
-
-    boolean isFinal();
-    boolean isToken();
-    String getContent();
-    String toString();
-
+    public abstract boolean isFinal();
+    public abstract boolean isToken();
+    public abstract String getContent();
+    public abstract String toString();
 }
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 79d871d8c74..770ac24dcab 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
@@ -10,10 +10,11 @@ import com.yahoo.prelude.searcher.JuniperSearcher;
 import com.yahoo.text.XML;
 
 /**
- * Represents a tokenized string field in a Hit. The original raw content and the field
- * name cannot be modified. But the tokenized version can be retrieved and set.
+ * Represents a Field in a Hit. The original raw content and the field
+ * name cannot be modified. But the tokenized version can be retrieved
+ * and set.
  *
- * @author Lars Christian Jensen
+ * @author <a href="mailto:larschr@yahoo-inc.com">Lars Christian Jensen</a>
  */
 public class HitField {
 
@@ -344,7 +345,10 @@ public class HitField {
         return xml.toString();
     }
 
-    /** Returns the content of this field, using the arguments as bolding tags, as an XML string */
+    /**
+     * @return the content of this field, using the arguments as bolding
+     * tags, as an XML string
+     */
     public String quotedContent(String boldOpenTag,
                                 String boldCloseTag,
                                 String separatorTag,
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/ImmutableFieldPart.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/ImmutableFieldPart.java
index 268e1b53459..fa0ca62405f 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/ImmutableFieldPart.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/ImmutableFieldPart.java
@@ -2,12 +2,12 @@
 package com.yahoo.prelude.hitfield;
 
 /**
- * Represents an element of a hit property which is an immutable string element
+ * Represents an element of a hit property which is a possibly
+ * mutable string element
  *
- * @author Steinar Knutsen
+ * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  */
 public class ImmutableFieldPart implements FieldPart {
-
     private final String content;
     private final String initContent;
     // Whether this element represents a (part of) a token or a
@@ -15,12 +15,10 @@ public class ImmutableFieldPart implements FieldPart {
     // parts should inherit this state from the object they were
     // split from.
     private boolean tokenOrDelimiter;
-
     public ImmutableFieldPart(String initContent,
                               boolean tokenOrDelimiter) {
         this(initContent, initContent, tokenOrDelimiter);
     }
-
     public ImmutableFieldPart(String initContent,
                               String content,
                               boolean tokenOrDelimiter) {
@@ -29,17 +27,9 @@ public class ImmutableFieldPart implements FieldPart {
         this.content = content;
         this.tokenOrDelimiter = tokenOrDelimiter;
     }
-
-    @Override
     public boolean isFinal() { return true; }
-    @Override
     public boolean isToken() { return tokenOrDelimiter; }
-    @Override
     public String getContent() { return content; }
-
     public String getInitContent() { return initContent; }
-
-    @Override
     public String toString() { return content; }
-
 }
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 06db012309e..bdd7cf04c3e 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
@@ -19,7 +19,7 @@ import java.util.Iterator;
 /**
  * A JSON wrapper. Contains XML-style rendering of a JSON structure.
  *
- * @author Steinar Knutsen
+ * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  */
 public class JSONString implements Inspectable {
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/MarkupFieldPart.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/MarkupFieldPart.java
index 17def6771ae..23ca8272851 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/MarkupFieldPart.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/MarkupFieldPart.java
@@ -4,31 +4,19 @@ package com.yahoo.prelude.hitfield;
 /**
  * Represents an element of a hit property which is markup, not content.
  *
- * @author Steinar Knutsen
+ * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  */
 public class MarkupFieldPart implements FieldPart {
-
     private String content;
-
     public MarkupFieldPart(String content) {
         this.content = content;
     }
-
-    @Override
     public boolean isFinal() { return true; }
-
     // Markup is never part of tokens as such
-    @Override
     public boolean isToken() { return false; }
-
     public void setContent(String content) {
         this.content = content;
     }
-
-    @Override
     public String getContent() { return content; }
-
-    @Override
     public String toString() { return content; }
-
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/RawData.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/RawData.java
index a0c9b10c519..dbbbca63d43 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/RawData.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/RawData.java
@@ -6,8 +6,8 @@ package com.yahoo.prelude.hitfield;
  *
  * @author arnej27959
  */
-public final class RawData {
-
+public final class RawData
+{
     private byte[] content;
 
     /**
@@ -52,5 +52,4 @@ public final class RawData {
         }
         return buf.toString();
     }
-
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/StringFieldPart.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/StringFieldPart.java
index 58018305fef..d7607fb7100 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/StringFieldPart.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/StringFieldPart.java
@@ -5,10 +5,9 @@ package com.yahoo.prelude.hitfield;
  * Represents an element of a hit property which is a possibly
  * mutable string element
  *
- * @author Steinar Knutsen
+ * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  */
 public class StringFieldPart implements FieldPart {
-
     private String content;
     private final String initContent;
     // Whether this element represents a (part of) a token or a
@@ -16,28 +15,17 @@ public class StringFieldPart implements FieldPart {
     // parts should inherit this state from the object they were
     // split from.
     private boolean tokenOrDelimiter;
-
     public StringFieldPart(String content, boolean tokenOrDelimiter) {
         this.content = content;
         initContent = content;
         this.tokenOrDelimiter = tokenOrDelimiter;
     }
-
-    @Override
     public boolean isFinal() { return false; }
-
-    @Override
     public boolean isToken() { return tokenOrDelimiter; }
-
-    @Override
     public String getContent() { return content; }
-
     public void setContent(String content) {
         this.content = content;
     }
     public String getInitContent() { return initContent; }
-
-    @Override
     public String toString() { return content; }
-
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/XmlRenderer.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/XmlRenderer.java
index 99c5daa05b8..8bafbfd6ab5 100644
--- a/container-search/src/main/java/com/yahoo/prelude/hitfield/XmlRenderer.java
+++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/XmlRenderer.java
@@ -1,14 +1,21 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.hitfield;
 
+import com.yahoo.text.Utf8;
 import com.yahoo.text.XML;
 import com.yahoo.data.access.Inspector;
+import com.yahoo.data.access.Inspectable;
 import com.yahoo.data.access.Type;
+import com.yahoo.data.access.simple.Value;
+import com.yahoo.data.access.slime.SlimeAdapter;
+import java.nio.charset.StandardCharsets;
+
+import java.util.Iterator;
 import java.util.Map;
 
 /**
  * Utility class for converting accessible data into the historical "prelude" xml format.
- */
+ **/
 public class XmlRenderer {
 
     public static StringBuilder render(StringBuilder target, Inspector value) {